hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-08 18:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

update jquery attr into prop method for checked and disabled properties

Browse Source
This commit is contained in:
Florian BLOUET
2015-11-25 16:40:45 +01:00
parent 454f9d4db0
commit 5d2735cd0a
18 changed files with 78 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/www/prod/js/jquery.Selection.js
View File

@@ -35,10 +35,8 @@
this.$container.data('selectionnable', this); this.$container.data('selectionnable', this);
this.$container.addClass('selectionnable'); this.$container.addClass('selectionnable');
this.$container
jQuery(this.options.selector, this.$container) .on('click', this.options.selector, function(event) {
.on('click', function (event) {
if (typeof $this.options.selectStart === 'function') { if (typeof $this.options.selectStart === 'function') {
$this.options.selectStart(jQuery.extend(jQuery.Event('selectStart'), event), $this); $this.options.selectStart(jQuery.extend(jQuery.Event('selectStart'), event), $this);
} }

13
resources/www/prod/js/jquery.main-prod.js
View File

@@ -207,7 +207,7 @@ function checkFilters(save) {
var nbSelectedColls = 0; var nbSelectedColls = 0;
$this.find('.checkbas').each(function (idx, el) { $this.find('.checkbas').each(function (idx, el) {
nbCols++; nbCols++;
if($(this).attr("checked")) { if($(this).prop('checked')) {
nbSelectedColls++; nbSelectedColls++;
nbTotalSelectedColls++; nbTotalSelectedColls++;
search.bases[sbas_id].push($(this).val()); search.bases[sbas_id].push($(this).val());
@@ -2780,8 +2780,7 @@ function deploy(deployer, todeploy_selector)
} }
function clksbas(el, sbas_id) { function clksbas(el, sbas_id) {
var bool = $(el).attr('checked'); var bool = $(el).prop('checked');
$.each($('.sbascont_' + sbas_id + ' :checkbox'), function () { $.each($('.sbascont_' + sbas_id + ' :checkbox'), function () {
this.checked = bool; this.checked = bool;
}); });
@@ -3055,16 +3054,16 @@ function set_up_feed_box(data) {
data: $form.serializeArray(), data: $form.serializeArray(),
dataType: 'json', dataType: 'json',
beforeSend: function () { beforeSend: function () {
$('button', dialog.getDomElement()).attr('disabled', 'disabled'); $('button', dialog.getDomElement()).prop('disabled', true);
}, },
error: function () { error: function () {
$('button', dialog.getDomElement()).removeAttr('disabled'); $('button', dialog.getDomElement()).prop('disabled', false);
}, },
timeout: function () { timeout: function () {
$('button', dialog.getDomElement()).removeAttr('disabled'); $('button', dialog.getDomElement()).prop('disabled', false);
}, },
success: function (data) { success: function (data) {
$('button', dialog.getDomElement()).removeAttr('disabled'); $('button', dialog.getDomElement()).prop('disabled', false);
if (data.error === true) { if (data.error === true) {
alert(data.message); alert(data.message);
return; return;

8
resources/www/prod/js/record.editor.js
View File

@@ -1300,16 +1300,16 @@ function replace() {
var where = $("[name=EditSR_Where]:checked", p4.edit.editBox).val(); var where = $("[name=EditSR_Where]:checked", p4.edit.editBox).val();
var commut = ""; var commut = "";
var rgxp = $("#EditSROptionRX", p4.edit.editBox).attr('checked') ? true : false; var rgxp = $("#EditSROptionRX", p4.edit.editBox).prop('checked') ? true : false;
var r_search; var r_search;
if (rgxp) { if (rgxp) {
r_search = search; r_search = search;
commut = ($("#EditSR_RXG", p4.edit.editBox).attr('checked') ? "g" : "") commut = ($("#EditSR_RXG", p4.edit.editBox).prop('checked') ? "g" : "")
+ ($("#EditSR_RXI", p4.edit.editBox).attr('checked') ? "i" : ""); + ($("#EditSR_RXI", p4.edit.editBox).prop('checked') ? "i" : "");
} }
else { else {
commut = $("#EditSR_case", p4.edit.editBox).attr('checked') ? "g" : "gi"; commut = $("#EditSR_case", p4.edit.editBox).prop('checked') ? "g" : "gi";
r_search = ""; r_search = "";
for (i = 0; i < search.length; i++) { for (i = 0; i < search.length; i++) {
var c = search.charAt(i); var c = search.charAt(i);

17
resources/www/report/js/report.js
View File

@@ -44,14 +44,21 @@ $(document).ready(function () {
$("ul.multiselect .coll-checkbox", $(this).closest('.form2')).attr("checked", false); $("ul.multiselect .coll-checkbox", $(this).closest('.form2')).attr("checked", false);
}); });
$(".multiselect-group").toggle(function () { // toggle is deprecated:
var $this = $(this); var hasMultiSelectionGroup = false;
var groupId = $this.data('group-id'); $(".multiselect-group").on('click', function () {
$(".checkbox-" + groupId, $this.closest('.form2')).attr("checked", true);
}, function () { if( hasMultiSelectionGroup === true) {
var $this = $(this); var $this = $(this);
var groupId = $this.data('group-id'); var groupId = $this.data('group-id');
$(".checkbox-" + groupId, $this.closest('.form2')).attr("checked", false); $(".checkbox-" + groupId, $this.closest('.form2')).attr("checked", false);
hasMultiSelectionGroup = false;
} else {
var $this = $(this);
var groupId = $this.data('group-id');
$(".checkbox-" + groupId, $this.closest('.form2')).attr("checked", true);
hasMultiSelectionGroup = true;
}
}); });
}); });
//#############END DOCUMENT READY ######################################// //#############END DOCUMENT READY ######################################//

4
templates/web/admin/collection/collection.html.twig
View File

@@ -302,7 +302,7 @@
url: form.attr('action'), url: form.attr('action'),
data: form.serializeArray(), data: form.serializeArray(),
beforeSend : function() { beforeSend : function() {
submitLink.attr('disabled', true).addClass('disabled'); submitLink.prop('disabled', true).addClass('disabled');
}, },
success: function(datas) { success: function(datas) {
if(datas.success) { if(datas.success) {
@@ -320,7 +320,7 @@
} }
}, },
complete: function() { complete: function() {
submitLink.attr('disabled', false).removeClass('disabled'); submitLink.prop('disabled', false).removeClass('disabled');
} }
}); });
} }

12
templates/web/admin/collection/reorder.html.twig
View File

@@ -83,7 +83,7 @@
data: {order: order}, data: {order: order},
url: '{{ path('admin_database_submit_collections_order', {'databox_id': app['request'].attributes.get('databox_id')}) }}', url: '{{ path('admin_database_submit_collections_order', {'databox_id': app['request'].attributes.get('databox_id')}) }}',
beforeSend : function() { beforeSend : function() {
$this.attr('disabled', true); $this.prop('disabled',true)
}, },
success : function(datas) { success : function(datas) {
var html = _.template($("#alert_"+ (datas.success ? "success" : "error") +"_tpl").html(), { var html = _.template($("#alert_"+ (datas.success ? "success" : "error") +"_tpl").html(), {
@@ -92,7 +92,7 @@
$('#notification').html(html); $('#notification').html(html);
}, },
complete : function() { complete : function() {
$this.attr('disabled', false); $this.prop('disabled',false)
} }
}); });
}); });
@@ -118,15 +118,15 @@
var selectedIndex = select.prop("selectedIndex"); var selectedIndex = select.prop("selectedIndex");
if(selectedIndex !== -1 ) { if(selectedIndex !== -1 ) {
if (selectedIndex === 0) { if (selectedIndex === 0) {
upButton.attr('disabled', true); upButton.prop('disabled', true)
} else { } else {
upButton.attr('disabled', false); upButton.prop('disabled', false)
} }
if (selectedIndex + 1 === select.find('option').length) { if (selectedIndex + 1 === select.find('option').length) {
downButton.attr('disabled', true); downButton.prop('disabled', true)
} else { } else {
downButton.attr('disabled', false); downButton.prop('disabled', false)
} }
} }
} }

4
templates/web/admin/collection/suggested_value.html.twig
View File

@@ -768,9 +768,9 @@ function activer_bout(idBout,val)
if( o.length > 0 ) { if( o.length > 0 ) {
if (!val) { if (!val) {
o.attr("disabled", true); o.prop('disabled', true);
} else { } else {
o.removeAttr("disabled"); o.prop('disabled', false);
} }
} }
} }

6
templates/web/admin/databox/databox.html.twig
View File

@@ -313,7 +313,7 @@
$('#is_indexable').bind('change', function(){ $('#is_indexable').bind('change', function(){
var form = $(this).closest('form'); var form = $(this).closest('form');
var checked = !!$(this).attr('checked'); var checked = !!$(this).prop('checked');
$.ajax({ $.ajax({
dataType: 'json', dataType: 'json',
@@ -366,7 +366,7 @@
url: form.attr('action'), url: form.attr('action'),
data: form.serializeArray(), data: form.serializeArray(),
before : function() { before : function() {
submitLink.attr('disabled', true).addClass('disabled'); submitLink.prop('disabled', true).addClass('disabled');
}, },
success: function(datas) { success: function(datas) {
if(datas.success) { if(datas.success) {
@@ -380,7 +380,7 @@
} }
}, },
complete: function() { complete: function() {
submitLink.attr('disabled', false).removeClass('disabled'); submitLink.prop('disabled', false).removeClass('disabled');
} }
}); });
} }

6
templates/web/admin/publications/wrapper.html.twig
View File

@@ -61,10 +61,10 @@
}); });
$('#edit_pub_public').bind('change', function(){ $('#edit_pub_public').bind('change', function(){
if($(this).attr('checked') === true) if($(this).prop('checked') === true)
$('#edit_pub_base_id').attr('disabled', 'disabled'); $('#edit_pub_base_id').prop('disabled', true);
else else
$('#edit_pub_base_id').removeAttr('disabled'); $('#edit_pub_base_id').prop('disabled', false);
}); });
}); });
</script> </script>

22
templates/web/common/dialog_export.html.twig
View File

@@ -494,10 +494,10 @@
$('#ftp .ftp_form').hide(); $('#ftp .ftp_form').hide();
$('#ftp .ftp_form_'+$(this).val()).show(); $('#ftp .ftp_form_'+$(this).val()).show();
$('.ftp_folder_check', p4.Dialog.get(1).getDomElement()).unbind('change').bind('change', function(){ $('.ftp_folder_check', p4.Dialog.get(1).getDomElement()).unbind('change').bind('change', function(){
if($(this).attr('checked')) if($(this).prop('checked'))
$(this).next().removeAttr('disabled'); $(this).next().prop('disabled',false);
else else
$(this).next().attr('disabled','disabled'); $(this).next().prop('disabled',true);
}); });
}).trigger('change'); }).trigger('change');
}); });
@@ -511,7 +511,7 @@
function check_TOU(container) function check_TOU(container)
{ {
var checkbox = $('input[name="TOU_accept"]', $(container)); var checkbox = $('input[name="TOU_accept"]', $(container));
var go = checkbox.length === 0 || checkbox.attr('checked'); var go = checkbox.length === 0 || checkbox.prop('checked');
if(!go) if(!go)
{ {
@@ -538,7 +538,7 @@
var go = required = false; var go = required = false;
$('input[name="obj[]"]', $(container)).each(function(){ $('input[name="obj[]"]', $(container)).each(function(){
if($(this).attr('checked')) if($(this).prop('checked'))
{ {
go = true; go = true;
} }
@@ -689,11 +689,11 @@
var options = $('#order form').serialize(); var options = $('#order form').serialize();
var $this = $(this); var $this = $(this);
$this.attr('disabled', true).addClass('disabled'); $this.prop('disabled', true).addClass('disabled');
$.post("../prod/order/" $.post("../prod/order/"
, options , options
, function(data){ , function(data){
$this.attr('disabled', false).removeClass('disabled'); $this.prop('disabled', false).removeClass('disabled');
$('#order .order_button_loader').css('visibility','hidden'); $('#order .order_button_loader').css('visibility','hidden');
@@ -742,11 +742,11 @@
var options_addr = $('#ftp_form_stock form:visible').serialize(); var options_addr = $('#ftp_form_stock form:visible').serialize();
var options_join = $('#ftp_joined').serialize(); var options_join = $('#ftp_joined').serialize();
$this.attr('disabled','disabled'); $this.prop('disabled',true);
$.post("../prod/export/ftp/" $.post("../prod/export/ftp/"
, options_addr + '&' + options_join , options_addr + '&' + options_join
, function(data){ , function(data){
$this.removeAttr('disabled'); $this.prop('disabled', false);
$('#ftp .ftp_button_loader').hide(); $('#ftp .ftp_button_loader').hide();
if(data.success) { if(data.success) {
@@ -771,7 +771,7 @@
$('#ftp .tryftp_button').bind('click',function(){ $('#ftp .tryftp_button').bind('click',function(){
$('#ftp .tryftp_button_loader').css('visibility','visible'); $('#ftp .tryftp_button_loader').css('visibility','visible');
var $this = $(this); var $this = $(this);
$this.attr('disabled','disabled'); $this.prop('disabled',true)
var options_addr = $('#ftp_form_stock form:visible').serialize(); var options_addr = $('#ftp_form_stock form:visible').serialize();
$.post("../prod/export/ftp/test/" $.post("../prod/export/ftp/test/"
@@ -787,7 +787,7 @@
p4.Dialog.Create(options, 3).setContent(data.message); p4.Dialog.Create(options, 3).setContent(data.message);
$this.removeAttr('disabled'); $this.prop('disabled', false);
return; return;
} }

1
templates/web/common/index_bootstrap.html.twig
View File

@@ -19,6 +19,7 @@
<script type="text/javascript" src="/assets/vendors/modernizr/modernizr{% if not app.debug %}.min{% endif %}.js"></script> <script type="text/javascript" src="/assets/vendors/modernizr/modernizr{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript" src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script> <script type="text/javascript" src="/assets/vendors/jquery/jquery{% if not app.debug %}.min{% endif %}.js"></script>
<script src="http://code.jquery.com/jquery-migrate-1.2.1.js"></script>
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui{% if not app.debug %}.min{% endif %}.js"></script> <script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$.widget.bridge('uitooltip', $.ui.tooltip); $.widget.bridge('uitooltip', $.ui.tooltip);

8
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -374,7 +374,7 @@ $(document).ready(function(){
dataType : 'json', dataType : 'json',
data : form.serializeArray(), data : form.serializeArray(),
beforeSend: function(){ beforeSend: function(){
$this.attr('disabled', true); $this.prop('disabled', true);
}, },
success : function(data){ success : function(data){
if(!data.success){ if(!data.success){
@@ -385,7 +385,7 @@ $(document).ready(function(){
} }
}, },
complete: function(){ complete: function(){
$this.attr('disabled', false); $this.prop('disabled', false);
} }
}); });
@@ -439,7 +439,7 @@ $(document).ready(function(){
}); });
$("img", sliderWrapper).live("click", function(){ $("img", sliderWrapper).on("click", function(){
$('.selected', sliderWrapper).removeClass('selected'); $('.selected', sliderWrapper).removeClass('selected');
$(this).addClass('selected'); $(this).addClass('selected');
@@ -464,7 +464,7 @@ $(document).ready(function(){
.appendTo(sliderWrapper); .appendTo(sliderWrapper);
}); });
$("#thumb_canvas").live('tool_event', function(){ $("#thumb_canvas").on('tool_event', function(){
var thumbnail = $('.selected', sliderWrapper); var thumbnail = $('.selected', sliderWrapper);
if(thumbnail.length === 0) if(thumbnail.length === 0)

12
templates/web/prod/index.html.twig
View File

@@ -7,7 +7,7 @@
<div class="clksbas"> <div class="clksbas">
<span onclick="deploy(this, '.sbascont_{{sbas_id}}' );" class="deployer_closed" ></span> <span onclick="deploy(this, '.sbascont_{{sbas_id}}' );" class="deployer_closed" ></span>
<input type="checkbox" checked style="display: none;" id="sbasChkr_{{sbas_id}}_{{unique_id}}" class="sbasChkr_{{sbas_id}}" <input type="checkbox" checked style="display: none;" id="sbasChkr_{{sbas_id}}_{{unique_id}}" class="sbasChkr_{{sbas_id}}"
onchange="clksbas(this, {{sbas_id}});" /> onchange="clksbas(this, {{sbas_id}});" />AAAA
<label id="ADVSRCH_SBAS_LABEL_{{sbas_id}}" style="display: inline" class="checkbox danger_indicator" for="sbasChkr_{{sbas_id}}_{{unique_id}}"> <label id="ADVSRCH_SBAS_LABEL_{{sbas_id}}" style="display: inline" class="checkbox danger_indicator" for="sbasChkr_{{sbas_id}}_{{unique_id}}">
<span>{{sbas_id|sbas_labels(app)}}</span> <span>{{sbas_id|sbas_labels(app)}}</span>
<span class="infos_sbas_{{sbas_id}}"> <span class="infos_sbas_{{sbas_id}}">
@@ -516,7 +516,7 @@
<div class="" style="float:left; width:100%;margin-top:20px;"> <div class="" style="float:left; width:100%;margin-top:20px;">
{% set mod = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'advanced_search_reload') %} {% set mod = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'advanced_search_reload') %}
<label class="checkbox inline" for="user_settings_advanced_search_reload"> <label class="checkbox inline" for="user_settings_advanced_search_reload">
<input onchange="setPref('advanced_search_reload',$(this).attr('checked')?'1' : '0');" name="advanced_search_reload" type="checkbox" style="margin: 3px 0 0 -18px;" class="checkbox" value="1" id="user_settings_advanced_search_reload" {% if mod == '1' %}checked="checked"{% endif %}/> <input onchange="setPref('advanced_search_reload',$(this).prop('checked')?'1' : '0');" name="advanced_search_reload" type="checkbox" style="margin: 3px 0 0 -18px;" class="checkbox" value="1" id="user_settings_advanced_search_reload" {% if mod == '1' %}checked="checked"{% endif %}/>
{{ 'Use latest search settings on Production loading' | trans }} {{ 'Use latest search settings on Production loading' | trans }}
</label> </label>
</div> </div>
@@ -574,7 +574,7 @@
{% set doctype_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'doctype_display') %} {% set doctype_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'doctype_display') %}
<h1>{{'Type de documents' | trans }}</h1> <h1>{{'Type de documents' | trans }}</h1>
<label class="checkbox" for="doctype_display_show"> <label class="checkbox" for="doctype_display_show">
<input onchange="setPref('doctype_display',($(this).attr('checked') ? '1' :'0'));" name="doctype_display" type="checkbox" class="checkbox" value="1" id="doctype_display_show" {% if doctype_display != '0' %}checked="checked"{% endif %}/> <input onchange="setPref('doctype_display',($(this).prop('checked') ? '1' :'0'));" name="doctype_display" type="checkbox" class="checkbox" value="1" id="doctype_display_show" {% if doctype_display != '0' %}checked="checked"{% endif %}/>
{{ 'Afficher une icone' | trans }} {{ 'Afficher une icone' | trans }}
</label> </label>
@@ -700,7 +700,7 @@
<div> <div>
{% set basket_status_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') %} {% set basket_status_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') %}
<label for="basket_status_display" class="checkbox"> <label for="basket_status_display" class="checkbox">
<input onchange="setPref('basket_status_display',($(this).attr('checked') ? '1' :'0'));" <input onchange="setPref('basket_status_display',($(this).prop('checked') ? '1' :'0'));"
name="basket_status_display" type="checkbox" class="checkbox" value="1" name="basket_status_display" type="checkbox" class="checkbox" value="1"
id="basket_status_display" {% if basket_status_display == '1' %}checked="checked"{% endif %} /> id="basket_status_display" {% if basket_status_display == '1' %}checked="checked"{% endif %} />
{{ 'Afficher les status' | trans }} {{ 'Afficher les status' | trans }}
@@ -709,7 +709,7 @@
<div> <div>
{% set basket_caption_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') %} {% set basket_caption_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') %}
<label for="basket_caption_display" class="checkbox"> <label for="basket_caption_display" class="checkbox">
<input onchange="setPref('basket_caption_display',($(this).attr('checked') ? '1' :'0'));" <input onchange="setPref('basket_caption_display',($(this).prop('checked') ? '1' :'0'));"
name="basket_caption_display" type="checkbox" class="checkbox" value="1" name="basket_caption_display" type="checkbox" class="checkbox" value="1"
id="basket_caption_display" {% if basket_caption_display == '1' %}checked="checked"{% endif %} /> id="basket_caption_display" {% if basket_caption_display == '1' %}checked="checked"{% endif %} />
{{ 'Afficher la fiche descriptive' | trans }} {{ 'Afficher la fiche descriptive' | trans }}
@@ -718,7 +718,7 @@
<div> <div>
{% set basket_title_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') %} {% set basket_title_display = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') %}
<label for="basket_title_display" class="checkbox"> <label for="basket_title_display" class="checkbox">
<input onchange="setPref('basket_title_display',($(this).attr('checked') ? '1' :'0'));" <input onchange="setPref('basket_title_display',($(this).prop('checked') ? '1' :'0'));"
name="basket_title_display" type="checkbox" class="checkbox" value="1" name="basket_title_display" type="checkbox" class="checkbox" value="1"
id="basket_title_display" {% if basket_title_display == '1' %}checked="checked"{% endif %} /> id="basket_title_display" {% if basket_title_display == '1' %}checked="checked"{% endif %} />
{{ 'Afficher le titre' | trans }} {{ 'Afficher le titre' | trans }}

12
templates/web/prod/orders/order_item.html.twig
View File

@@ -190,7 +190,7 @@ function do_send_documents(order_id, elements_ids, force)
var dialog = p4.Dialog.get(1); var dialog = p4.Dialog.get(1);
var cont = dialog.getDomElement(); var cont = dialog.getDomElement();
$('button.deny, button.send', cont).attr('disabled','disabled'); $('button.deny, button.send', cont).prop('disabled', true);
$('.activity_indicator', cont).show(); $('.activity_indicator', cont).show();
$.ajax({ $.ajax({
@@ -212,11 +212,11 @@ function do_send_documents(order_id, elements_ids, force)
dialog.load('../prod/order/' + order_id + '/?success=' + success + '&action=send'); dialog.load('../prod/order/' + order_id + '/?success=' + success + '&action=send');
}, },
error: function(){ error: function(){
$('button.deny, button.send', cont).removeAttr('disabled'); $('button.deny, button.send', cont).prop('disabled', false);
$('.activity_indicator', cont).hide(); $('.activity_indicator', cont).hide();
}, },
timeout: function(){ timeout: function(){
$('button.deny, button.send', cont).removeAttr('disabled'); $('button.deny, button.send', cont).prop('disabled', false);
$('.activity_indicator', cont).hide(); $('.activity_indicator', cont).hide();
} }
}); });
@@ -240,7 +240,7 @@ function deny_documents(order_id)
return; return;
} }
$('button.deny, button.send', cont).attr('disabled','disabled'); $('button.deny, button.send', cont).prop('disabled', true);
$('.activity_indicator', cont).show(); $('.activity_indicator', cont).show();
$.ajax({ $.ajax({
@@ -261,11 +261,11 @@ function deny_documents(order_id)
dialog.load('/prod/order/' + order_id + '/?success=' + success + '&action=deny'); dialog.load('/prod/order/' + order_id + '/?success=' + success + '&action=deny');
}, },
error: function(){ error: function(){
$('button.deny, button.send', cont).removeAttr('disabled'); $('button.deny, button.send', cont).prop('disabled', false);
$('.activity_indicator', cont).hide(); $('.activity_indicator', cont).hide();
}, },
timeout: function(){ timeout: function(){
$('button.deny, button.send', cont).removeAttr('disabled'); $('button.deny, button.send', cont).prop('disabled', false);
$('.activity_indicator', cont).hide(); $('.activity_indicator', cont).hide();
} }
}); });

4
templates/web/prod/upload/lazaret.html.twig
View File

@@ -64,12 +64,12 @@
} }
function startAjax(button){ function startAjax(button){
button.closest(".btn-group").find('button').attr('disabled', true); button.closest(".btn-group").find('button').prop('disabled', true);
button.closest(".btn-group").addClass('loading'); button.closest(".btn-group").addClass('loading');
} }
function stopAjax(button){ function stopAjax(button){
button.closest(".btn-group").find('button').attr('disabled', false); button.closest(".btn-group").find('button').prop('disabled', false);
button.closest(".btn-group").removeClass('loading'); button.closest(".btn-group").removeClass('loading');
} }

2
templates/web/prod/upload/upload.html.twig
View File

@@ -250,7 +250,7 @@ $(document).ready(function () {
}); });
//Remove an element from the upload box //Remove an element from the upload box
$("button.remove-element", UploaderManager.getUploadBox()).live("click", function(){ $("button.remove-element", UploaderManager.getUploadBox()).on("click", function(){
var container = $(this).closest("li"); var container = $(this).closest("li");
var uploadIndex = container.find("input[name=uploadIndex]").val(); var uploadIndex = container.find("input[name=uploadIndex]").val();
UploaderManager.removeData(uploadIndex); UploaderManager.removeData(uploadIndex);

6
templates/web/setup/step2.html.twig
View File

@@ -8,8 +8,8 @@
$('.databox_create').bind('change', function(){ $('.databox_create').bind('change', function(){
var $this = $(this); var $this = $(this);
var $current = $this.closest('.steps'); var $current = $this.closest('.steps');
$('.databox_creation_input', $current).attr('disabled', $this.attr('checked')); $('.databox_creation_input', $current).prop('disabled', $this.prop('checked'));
$('.db_tester', $current).attr('disabled', $this.attr('checked')).toggleClass( "ui-state-disabled", $this.attr('checked') ); $('.db_tester', $current).prop('disabled', $this.prop('checked')).toggleClass( "ui-state-disabled", $this.prop('checked') );
}); });
$('.ab_opt_toggler').bind('click', function(){ $('.ab_opt_toggler').bind('click', function(){
$('.optional_ab_datas').fadeToggle(); $('.optional_ab_datas').fadeToggle();
@@ -110,7 +110,7 @@
var callback = function(){ var callback = function(){
if(window.console) if(window.console)
console.log('Processing install....'); console.log('Processing install....');
$(this).attr('disabled', 'disabled'); $(this)..prop('disabled', true);
var dialog = $('#install_wait'); var dialog = $('#install_wait');
dialog.dialog({ dialog.dialog({
modal:true, modal:true,

2
www/scripts/apps/admin/fields/views/create.js
View File

@@ -161,7 +161,7 @@ define([
fieldBlock.is(":hidden") ? fieldBlock.show() : fieldBlock.hide(); fieldBlock.is(":hidden") ? fieldBlock.show() : fieldBlock.hide();
addBtn.attr('disabled', !fieldBlock.is(":hidden")); addBtn.prop('disabled', !fieldBlock.is(":hidden"));
AdminFieldApp.resizeListBlock(); AdminFieldApp.resizeListBlock();