| - | - |
| + | + |
'+$.i18n('update_label_type') + ' ' + type + '
'+$.i18n('update_label_description')+' '+DOMPurify.sanitize(marked(window.gitHubVersionList[key].body))+'
'+$.i18n('update_label_type') + ' ' + type + '
'+$.i18n('update_label_description')+' '+DOMPurify.sanitize(marked.parse(window.gitHubVersionList[key].body))+'
' + $.i18n('general_wiki_moreto', $.i18n('conf_leds_nav_label_ledlayout')) + buildWL("user/advanced/Advanced.html#led-layout", "Wiki") + '
'); // bind change event to all inputs - $('.ledCLconstr').bind("change", function () { + $('.ledCLconstr').on("change", function () { //Ensure Values are in min/max ranges if ($(this).val() < $(this).attr('min') * 1) { $(this).val($(this).attr('min')); } @@ -543,7 +543,7 @@ $(document).ready(function () { createClassicLeds(); }); - $('.ledMAconstr').bind("change", function () { + $('.ledMAconstr').on("change", function () { valValue(this.id, this.value, this.min, this.max); createMatrixLeds(); }); @@ -587,16 +587,16 @@ $(document).ready(function () { } if (success) { - $('#leds_custom_updsim').attr("disabled", false); - $('#leds_custom_save').attr("disabled", false); + $('#leds_custom_updsim').prop("disabled", false); + $('#leds_custom_save').prop("disabled", false); } else { - $('#leds_custom_updsim').attr("disabled", true); - $('#leds_custom_save').attr("disabled", true); + $('#leds_custom_updsim').prop("disabled", true); + $('#leds_custom_save').prop("disabled", true); } if (window.readOnlyMode) { - $('#leds_custom_save').attr('disabled', true); + $('#leds_custom_save').prop('disabled', true); } } }, finalLedArray); @@ -604,8 +604,8 @@ $(document).ready(function () { //TODO: HACK! No callback for schema validation - Add it! setInterval(function () { if ($('#aceedit table').hasClass('jsoneditor-text-errors')) { - $('#leds_custom_updsim').attr("disabled", true); - $('#leds_custom_save').attr("disabled", true); + $('#leds_custom_updsim').prop("disabled", true); + $('#leds_custom_save').prop("disabled", true); } }, 1000); @@ -701,7 +701,7 @@ $(document).ready(function () { } // change save button state based on validation result - blacklist_editor.validate().length || window.readOnlyMode ? $('#btn_bl_save').attr('disabled', true) : $('#btn_bl_save').attr('disabled', false); + blacklist_editor.validate().length || window.readOnlyMode ? $('#btn_bl_save').prop('disabled', true) : $('#btn_bl_save').prop('disabled', false); }); }); @@ -751,14 +751,14 @@ $(document).ready(function () { $("#info_container_text").html(infoTextDefault); // change save button state based on validation result - conf_editor.validate().length || window.readOnlyMode ? $('#btn_submit_controller').attr('disabled', true) : $('#btn_submit_controller').attr('disabled', false); + conf_editor.validate().length || window.readOnlyMode ? $('#btn_submit_controller').prop('disabled', true) : $('#btn_submit_controller').prop('disabled', false); // led controller sepecific wizards $('#btn_wiz_holder').html(""); $('#btn_led_device_wiz').off(); if (ledType == "philipshue") { - $('#root_specificOptions_useEntertainmentAPI').bind("change", function () { + $('#root_specificOptions_useEntertainmentAPI').on("change", function () { var ledWizardType = (this.checked) ? "philipshueentertainment" : ledType; var data = { type: ledWizardType }; var hue_title = (this.checked) ? 'wiz_hue_e_title' : 'wiz_hue_title'; @@ -936,10 +936,10 @@ $(document).ready(function () { if (!conf_editor.validate().length) { if (canIdentify) { $("#btn_test_controller").show(); - $('#btn_test_controller').attr('disabled', false); + $('#btn_test_controller').prop('disabled', false); } else { $('#btn_test_controller').hide(); - $('#btn_test_controller').attr('disabled', true); + $('#btn_test_controller').prop('disabled', true); } } else { canSave = false; @@ -947,16 +947,16 @@ $(document).ready(function () { if (canSave) { if (!window.readOnlyMode) { - $('#btn_submit_controller').attr('disabled', false); + $('#btn_submit_controller').prop('disabled', false); } } else { - $('#btn_submit_controller').attr('disabled', true); + $('#btn_submit_controller').prop('disabled', true); } - window.readOnlyMode ? $('#btn_cl_save').attr('disabled', true) : $('#btn_submit').attr('disabled', false); - window.readOnlyMode ? $('#btn_ma_save').attr('disabled', true) : $('#btn_submit').attr('disabled', false); - window.readOnlyMode ? $('#leds_custom_save').attr('disabled', true) : $('#btn_submit').attr('disabled', false); + window.readOnlyMode ? $('#btn_cl_save').prop('disabled', true) : $('#btn_submit').prop('disabled', false); + window.readOnlyMode ? $('#btn_ma_save').prop('disabled', true) : $('#btn_submit').prop('disabled', false); + window.readOnlyMode ? $('#leds_custom_save').prop('disabled', true) : $('#btn_submit').prop('disabled', false); }); conf_editor.watch('root.specificOptions.hostList', () => { @@ -1040,8 +1040,8 @@ $(document).ready(function () { var output = conf_editor.getEditor("root.specificOptions.output").getValue(); if (output === "NONE" || output === "SELECT" || output === "") { - $('#btn_submit_controller').attr('disabled', true); - $('#btn_test_controller').attr('disabled', true); + $('#btn_submit_controller').prop('disabled', true); + $('#btn_test_controller').prop('disabled', true); $('#btn_test_controller').hide(); conf_editor.getEditor("root.generalOptions.hardwareLedCount").setValue(1); @@ -1080,13 +1080,13 @@ $(document).ready(function () { if (!conf_editor.validate().length) { if (canIdentify) { $("#btn_test_controller").show(); - $('#btn_test_controller').attr('disabled', false); + $('#btn_test_controller').prop('disabled', false); } else { $('#btn_test_controller').hide(); - $('#btn_test_controller').attr('disabled', true); + $('#btn_test_controller').prop('disabled', true); } if (!window.readOnlyMode) { - $('#btn_submit_controller').attr('disabled', false); + $('#btn_submit_controller').prop('disabled', false); } } } @@ -1522,7 +1522,7 @@ var updateSelectList = function (ledType, discoveryInfo) { if (discoveryInfo.devices.length == 0) { enumVals.push("NONE"); enumTitelVals.push($.i18n('edt_dev_spec_devices_discovered_none')); - $('#btn_submit_controller').attr('disabled', true); + $('#btn_submit_controller').prop('disabled', true); showAllDeviceInputOptions(key, false); } else { @@ -1564,7 +1564,7 @@ var updateSelectList = function (ledType, discoveryInfo) { if (discoveryInfo.devices.length == 0) { enumVals.push("NONE"); enumTitelVals.push($.i18n('edt_dev_spec_devices_discovered_none')); - $('#btn_submit_controller').attr('disabled', true); + $('#btn_submit_controller').prop('disabled', true); showAllDeviceInputOptions(key, false); } else { @@ -1606,7 +1606,7 @@ var updateSelectList = function (ledType, discoveryInfo) { if (discoveryInfo.devices.length == 0) { enumVals.push("NONE"); enumTitelVals.push($.i18n('edt_dev_spec_devices_discovered_none')); - $('#btn_submit_controller').attr('disabled', true); + $('#btn_submit_controller').prop('disabled', true); showAllDeviceInputOptions(key, false); $("#info_container_text").html($.i18n("conf_leds_info_ws281x")); @@ -1622,7 +1622,7 @@ var updateSelectList = function (ledType, discoveryInfo) { async function discover_device(ledType, params) { - $('#btn_submit_controller').attr('disabled', true); + $('#btn_submit_controller').prop('disabled', true); const result = await requestLedDeviceDiscovery(ledType, params); @@ -1642,7 +1642,7 @@ async function discover_device(ledType, params) { async function getProperties_device(ledType, key, params) { // Take care that connfig cannot be saved during background processing - $('#btn_submit_controller').attr('disabled', true); + $('#btn_submit_controller').prop('disabled', true); //Create ledType cache entry if (!devicesProperties[ledType]) { @@ -1659,13 +1659,13 @@ async function getProperties_device(ledType, key, params) { devicesProperties[ledType][key] = ledDeviceProperties; if (!window.readOnlyMode) { - $('#btn_submit_controller').attr('disabled', false); + $('#btn_submit_controller').prop('disabled', false); } } else { showNotification('warning', $.i18n('conf_leds_error_get_properties_text'), $.i18n('conf_leds_error_get_properties_title')) - $('#btn_submit_controller').attr('disabled', true); - $('#btn_test_controller').attr('disabled', true); + $('#btn_submit_controller').prop('disabled', true); + $('#btn_test_controller').prop('disabled', true); } } } @@ -1675,14 +1675,14 @@ async function getProperties_device(ledType, key, params) { async function identify_device(type, params) { // Take care that connfig cannot be saved and identification cannot be retriggerred during background processing - $('#btn_submit_controller').attr('disabled', true); - $('#btn_test_controller').attr('disabled', true); + $('#btn_submit_controller').prop('disabled', true); + $('#btn_test_controller').prop('disabled', true); await requestLedDeviceIdentification(type, params); - $('#btn_test_controller').attr('disabled', false); + $('#btn_test_controller').prop('disabled', false); if (!window.readOnlyMode) { - $('#btn_submit_controller').attr('disabled', false); + $('#btn_submit_controller').prop('disabled', false); } } diff --git a/assets/webconfig/js/content_logging.js b/assets/webconfig/js/content_logging.js index 0d5ffa02..54139023 100644 --- a/assets/webconfig/js/content_logging.js +++ b/assets/webconfig/js/content_logging.js @@ -20,7 +20,7 @@ $(document).ready(function () { }, true, true); conf_editor.on('change', function () { - conf_editor.validate().length || window.readOnlyMode ? $('#btn_submit').attr('disabled', true) : $('#btn_submit').attr('disabled', false); + conf_editor.validate().length || window.readOnlyMode ? $('#btn_submit').prop('disabled', true) : $('#btn_submit').prop('disabled', false); }); $('#btn_submit').off().on('click', function () { @@ -92,7 +92,7 @@ $(document).ready(function () { ); $(`#btn_scroll`).bootstrapToggle(); - $(`#btn_scroll`).change(e => { + $(`#btn_scroll`).on("change", e => { if (e.currentTarget.checked) { //Scroll to end of log isScroll = true; diff --git a/assets/webconfig/js/content_network.js b/assets/webconfig/js/content_network.js index 0ba4a7d8..96c13d4c 100644 --- a/assets/webconfig/js/content_network.js +++ b/assets/webconfig/js/content_network.js @@ -69,7 +69,7 @@ $(document).ready(function () { }, true, true); conf_editor_net.on('change', function () { - conf_editor_net.validate().length || window.readOnlyMode ? $('#btn_submit_net').attr('disabled', true) : $('#btn_submit_net').attr('disabled', false); + conf_editor_net.validate().length || window.readOnlyMode ? $('#btn_submit_net').prop('disabled', true) : $('#btn_submit_net').prop('disabled', false); }); $('#btn_submit_net').off().on('click', function () { @@ -82,7 +82,7 @@ $(document).ready(function () { }, true, true); conf_editor_json.on('change', function () { - conf_editor_json.validate().length || window.readOnlyMode ? $('#btn_submit_jsonserver').attr('disabled', true) : $('#btn_submit_jsonserver').attr('disabled', false); + conf_editor_json.validate().length || window.readOnlyMode ? $('#btn_submit_jsonserver').prop('disabled', true) : $('#btn_submit_jsonserver').prop('disabled', false); }); $('#btn_submit_jsonserver').off().on('click', function () { @@ -104,7 +104,7 @@ $(document).ready(function () { showInputOptionsForKey(conf_editor_fbs, "flatbufServer", "enable", false); $('#flatbufServerHelpPanelId').hide(); } - conf_editor_fbs.validate().length || window.readOnlyMode ? $('#btn_submit_fbserver').attr('disabled', true) : $('#btn_submit_fbserver').attr('disabled', false); + conf_editor_fbs.validate().length || window.readOnlyMode ? $('#btn_submit_fbserver').prop('disabled', true) : $('#btn_submit_fbserver').prop('disabled', false); }); $('#btn_submit_fbserver').off().on('click', function () { @@ -127,7 +127,7 @@ $(document).ready(function () { showInputOptionsForKey(conf_editor_proto, "protoServer", "enable", false); $('#protoServerHelpPanelId').hide(); } - conf_editor_proto.validate().length || window.readOnlyMode ? $('#btn_submit_protoserver').attr('disabled', true) : $('#btn_submit_protoserver').attr('disabled', false); + conf_editor_proto.validate().length || window.readOnlyMode ? $('#btn_submit_protoserver').prop('disabled', true) : $('#btn_submit_protoserver').prop('disabled', false); }); $('#btn_submit_protoserver').off().on('click', function () { @@ -151,7 +151,7 @@ $(document).ready(function () { showInputOptionsForKey(conf_editor_forw, "forwarder", "enable", false); $('#forwarderHelpPanelId').hide(); } - conf_editor_forw.validate().length || window.readOnlyMode ? $('#btn_submit_forwarder').attr('disabled', true) : $('#btn_submit_forwarder').attr('disabled', false); + conf_editor_forw.validate().length || window.readOnlyMode ? $('#btn_submit_forwarder').prop('disabled', true) : $('#btn_submit_forwarder').prop('disabled', false); }); $('#btn_submit_forwarder').off().on('click', function () { @@ -204,10 +204,10 @@ $(document).ready(function () { $('#btn_create_tok').off().on('click', function () { requestToken(encodeHTML($('#tok_comment').val())) $('#tok_comment').val("") - $('#btn_create_tok').attr('disabled', true) + $('#btn_create_tok').prop('disabled', true) }); $('#tok_comment').off().on('input', function (e) { - (e.currentTarget.value.length >= 10) ? $('#btn_create_tok').attr('disabled', false) : $('#btn_create_tok').attr('disabled', true); + (e.currentTarget.value.length >= 10) ? $('#btn_create_tok').prop('disabled', false) : $('#btn_create_tok').prop('disabled', true); if (10 - e.currentTarget.value.length >= 1 && 10 - e.currentTarget.value.length <= 9) $('#tok_chars_needed').html(10 - e.currentTarget.value.length + " " + $.i18n('general_chars_needed')) else @@ -230,7 +230,7 @@ $(document).ready(function () { $("#conf_cont_tok").removeAttr('style') } - $('#root_network_apiAuth').change(function () { + $('#root_network_apiAuth').on("change", function () { var state = $(this).is(":checked"); checkApiTokenState(state); }); diff --git a/assets/webconfig/js/content_remote.js b/assets/webconfig/js/content_remote.js index 7d1f6bb4..c6a0b6d4d 100644 --- a/assets/webconfig/js/content_remote.js +++ b/assets/webconfig/js/content_remote.js @@ -225,7 +225,7 @@ $(document).ready(function () { $('#componentsbutton').append(d); $(`#${comp_btn_id}`).bootstrapToggle(); $(`#${comp_btn_id}`).bootstrapToggle((hyperionEnabled ? "enable" : "disable")); - $(`#${comp_btn_id}`).change(e => { + $(`#${comp_btn_id}`).on("change", e => { requestSetComponentState(e.currentTarget.id.split('_').pop(), e.currentTarget.checked); }); } @@ -363,7 +363,7 @@ $(document).ready(function () { } }); - $("#remote_input_img").change(function () { + $("#remote_input_img").on("change", function () { readImg(this, function (src, fileName) { lastFileName = fileName; if (src.includes(",")) diff --git a/assets/webconfig/js/content_webconfig.js b/assets/webconfig/js/content_webconfig.js index dc38ddc9..71c83cfd 100644 --- a/assets/webconfig/js/content_webconfig.js +++ b/assets/webconfig/js/content_webconfig.js @@ -14,7 +14,7 @@ }, true, true); conf_editor.on('change',function() { - conf_editor.validate().length || window.readOnlyMode ? $('#btn_submit').attr('disabled', true) : $('#btn_submit').attr('disabled', false); + conf_editor.validate().length || window.readOnlyMode ? $('#btn_submit').prop('disabled', true) : $('#btn_submit').prop('disabled', false); }); $('#btn_submit').off().on('click',function() { diff --git a/assets/webconfig/js/lib/dialog.min.js b/assets/webconfig/js/lib/dialog.min.js deleted file mode 100644 index cbe6ac29..00000000 --- a/assets/webconfig/js/lib/dialog.min.js +++ /dev/null @@ -1 +0,0 @@ -"undefined"==typeof gj&&(gj={}),gj.widget=function(){var a=this;a.xhr=null,a.generateGUID=function(){function a(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return a()+a()+"-"+a()+"-"+a()+"-"+a()+"-"+a()+a()+a()},a.mouseX=function(a){if(a){if(a.pageX)return a.pageX;if(a.clientX)return a.clientX+(document.documentElement.scrollLeft?document.documentElement.scrollLeft:document.body.scrollLeft);if(a.touches&&a.touches.length)return a.touches[0].pageX;if(a.changedTouches&&a.changedTouches.length)return a.changedTouches[0].pageX;if(a.originalEvent&&a.originalEvent.touches&&a.originalEvent.touches.length)return a.originalEvent.touches[0].pageX;if(a.originalEvent&&a.originalEvent.changedTouches&&a.originalEvent.changedTouches.length)return a.originalEvent.touches[0].pageX}return null},a.mouseY=function(a){if(a){if(a.pageY)return a.pageY;if(a.clientY)return a.clientY+(document.documentElement.scrollTop?document.documentElement.scrollTop:document.body.scrollTop);if(a.touches&&a.touches.length)return a.touches[0].pageY;if(a.changedTouches&&a.changedTouches.length)return a.changedTouches[0].pageY;if(a.originalEvent&&a.originalEvent.touches&&a.originalEvent.touches.length)return a.originalEvent.touches[0].pageY;if(a.originalEvent&&a.originalEvent.changedTouches&&a.originalEvent.changedTouches.length)return a.originalEvent.touches[0].pageY}return null}},gj.widget.prototype.init=function(a,b){var c,d,e;d=$.extend(!0,{},this.getHTMLConfig()||{}),$.extend(!0,d,a||{}),e=this.getConfig(d,b),this.attr("data-guid",e.guid),this.data(e);for(c in e)gj[b].events.hasOwnProperty(c)&&(this.on(c,e[c]),delete e[c]);for(plugin in gj[b].plugins)gj[b].plugins.hasOwnProperty(plugin)&&gj[b].plugins[plugin].configure(this,e,d);return this},gj.widget.prototype.getConfig=function(a,b){var c,d,e,f;c=$.extend(!0,{},gj[b].config.base),d=a.hasOwnProperty("uiLibrary")?a.uiLibrary:c.uiLibrary,gj[b].config[d]&&$.extend(!0,c,gj[b].config[d]),e=a.hasOwnProperty("iconsLibrary")?a.iconsLibrary:c.iconsLibrary,gj[b].config[e]&&$.extend(!0,c,gj[b].config[e]);for(f in gj[b].plugins)gj[b].plugins.hasOwnProperty(f)&&($.extend(!0,c,gj[b].plugins[f].config.base),gj[b].plugins[f].config[d]&&$.extend(!0,c,gj[b].plugins[f].config[d]),gj[b].plugins[f].config[e]&&$.extend(!0,c,gj[b].plugins[f].config[e]));return $.extend(!0,c,a),c.guid||(c.guid=this.generateGUID()),c},gj.widget.prototype.getHTMLConfig=function(){var a=this.data(),b=this[0].attributes;return b.width&&(a.width=b.width.nodeValue),b.height&&(a.height=b.height.nodeValue),b.align&&(a.align=b.align.nodeValue),a&&a.source&&(a.dataSource=a.source,delete a.source),a},gj.widget.prototype.createDoneHandler=function(){var a=this;return function(b){"string"==typeof b&&JSON&&(b=JSON.parse(b)),gj[a.data("type")].methods.render(a,b)}},gj.widget.prototype.createErrorHandler=function(){return function(a){a&&a.statusText&&"abort"!==a.statusText&&alert(a.statusText)}},gj.widget.prototype.reload=function(a){var b,c,d=this.data(),e=this.data("type");return void 0===d.dataSource&&gj[e].methods.useHtmlDataSource(this,d),$.extend(d.params,a),$.isArray(d.dataSource)?(c=gj[e].methods.filter(this),gj[e].methods.render(this,c)):"string"==typeof d.dataSource?(b={url:d.dataSource,data:d.params},this.xhr&&this.xhr.abort(),this.xhr=$.ajax(b).done(this.createDoneHandler()).fail(this.createErrorHandler())):"object"==typeof d.dataSource&&(d.dataSource.data||(d.dataSource.data={}),$.extend(d.dataSource.data,d.params),b=$.extend(!0,{},d.dataSource),"json"===b.dataType&&"object"==typeof b.data&&(b.data=JSON.stringify(b.data)),b.success||(b.success=this.createDoneHandler()),b.error||(b.error=this.createErrorHandler()),this.xhr&&this.xhr.abort(),this.xhr=$.ajax(b)),this},gj.documentManager={events:{},subscribeForEvent:function(a,b,c){if(gj.documentManager.events[a]&&0!==gj.documentManager.events[a].length){if(gj.documentManager.events[a][b])throw"Event "+a+" for widget with guid='"+b+"' is already attached.";gj.documentManager.events[a].push({widgetId:b,callback:c})}else gj.documentManager.events[a]=[{widgetId:b,callback:c}],$(document).on(a,gj.documentManager.executeCallbacks)},executeCallbacks:function(a){var b=gj.documentManager.events[a.type];if(b)for(var c=0;c