+
diff --git a/assets/webconfig/js/content_colors.js b/assets/webconfig/js/content_colors.js
index 1eada9e8..bb178b1c 100644
--- a/assets/webconfig/js/content_colors.js
+++ b/assets/webconfig/js/content_colors.js
@@ -81,4 +81,3 @@ $(document).ready( function() {
removeOverlay();
});
-
diff --git a/assets/webconfig/js/ui_utils.js b/assets/webconfig/js/ui_utils.js
index 6ba30cb9..2c3b8ac7 100644
--- a/assets/webconfig/js/ui_utils.js
+++ b/assets/webconfig/js/ui_utils.js
@@ -95,6 +95,10 @@ function loadContent(event, forceRefresh)
{
var tag;
+ var lastSelectedInstance = getStorage('lastSelectedInstance', false);
+ if(lastSelectedInstance && (lastSelectedInstance != window.currentHyperionInstance))
+ instanceSwitch(lastSelectedInstance);
+
if(typeof event != "undefined")
{
tag = event.currentTarget.hash;
@@ -154,10 +158,7 @@ function updateHyperionInstanceListing()
$('#hyperioninstance_'+data[key].instance).off().on("click",function(e){
var inst = e.currentTarget.id.split("_")[1]
- requestInstanceSwitch(inst)
- window.currentHyperionInstance = inst;
- window.currentHyperionInstanceName = getInstanceNameByIndex(inst);
- updateHyperionInstanceListing()
+ instanceSwitch(inst)
});
}
}
@@ -171,13 +172,26 @@ function updateUiOnInstance(inst)
$("#hyperion_global_setting_notify").fadeIn("fast");
else
$("#hyperion_global_setting_notify").attr("style", "display:none");
+
+ $("#dashboard_active_instance_friendly_name").html($.i18n('dashboard_active_instance') + ': ' + window.serverInfo.instance[inst].friendly_name);
+ $("#dashboard_active_instance").removeAttr("style");
}
else
{
$("#hyperion_global_setting_notify").fadeOut("fast");
+ $("#dashboard_active_instance").attr("style", "display:none");
}
}
+function instanceSwitch(inst)
+{
+ requestInstanceSwitch(inst)
+ window.currentHyperionInstance = inst;
+ window.currentHyperionInstanceName = getInstanceNameByIndex(inst);
+ setStorage('lastSelectedInstance', inst, false)
+ updateHyperionInstanceListing()
+}
+
function loadContentTo(containerId, fileName)
{
$(containerId).load("/content/"+fileName+".html");
diff --git a/assets/webconfig/js/wizard.js b/assets/webconfig/js/wizard.js
index 3b56796e..a65f68e2 100644
--- a/assets/webconfig/js/wizard.js
+++ b/assets/webconfig/js/wizard.js
@@ -1,852 +1,854 @@
-
- //clear priority and other tasks if people reload the page or lost connection while a wizard was active
- $(window.hyperion).one("ready", function(event) {
- if(getStorage("wizardactive") === 'true')
- {
- requestPriorityClear();
- setStorage("wizardactive", false);
- if(getStorage("kodiAddress") != null)
- {
- kodiAddress = getStorage("kodiAddress");
- sendToKodi("stop");
- }
- }
- });
-
- function resetWizard()
+//clear priority and other tasks if people reload the page or lost connection while a wizard was active
+$(window.hyperion).one("ready", function(event) {
+ if(getStorage("wizardactive") === 'true')
{
- $("#wizard_modal").modal('hide');
- clearInterval(wIntveralId);
requestPriorityClear();
setStorage("wizardactive", false);
- $('#wizp1').toggle(true);
- $('#wizp2').toggle(false);
- $('#wizp3').toggle(false);
- //cc
- if(withKodi)
+ if(getStorage("kodiAddress") != null)
+ {
+ kodiAddress = getStorage("kodiAddress");
sendToKodi("stop");
- step = 0;
- location.reload();
- }
-
- //rgb byte order wizard
- var wIntveralId;
- var new_rgb_order;
-
- function changeColor()
- {
- var color = $("#wiz_canv_color").css('background-color');
-
- if (color == 'rgb(255, 0, 0)')
- {
- $("#wiz_canv_color").css('background-color','rgb(0, 255, 0)');
- requestSetColor('0','255','0');
- }
- else
- {
- $("#wiz_canv_color").css('background-color','rgb(255, 0, 0)');
- requestSetColor('255','0','0');
}
}
+});
- function startWizardRGB()
+function resetWizard()
+{
+ $("#wizard_modal").modal('hide');
+ clearInterval(wIntveralId);
+ requestPriorityClear();
+ setStorage("wizardactive", false);
+ $('#wizp1').toggle(true);
+ $('#wizp2').toggle(false);
+ $('#wizp3').toggle(false);
+ //cc
+ if(withKodi)
+ sendToKodi("stop");
+ step = 0;
+ location.reload();
+}
+
+//rgb byte order wizard
+var wIntveralId;
+var new_rgb_order;
+
+function changeColor()
+{
+ var color = $("#wiz_canv_color").css('background-color');
+
+ if (color == 'rgb(255, 0, 0)')
{
- //create html
- $('#wiz_header').html('
'+$.i18n('wiz_rgb_title'));
- $('#wizp1_body').html('
'+$.i18n('wiz_rgb_title')+' '+$.i18n('wiz_rgb_intro1')+'
'+$.i18n('wiz_rgb_intro2')+'
');
- $('#wizp1_footer').html('
');
- $('#wizp2_body').html('
'+$.i18n('wiz_rgb_expl')+'
');
- $('#wizp2_body').append('
');
- $('#wizp2_body').append('
'+$.i18n('wiz_rgb_q')+' ');
- $('#wizp2_body').append('
'+$.i18n('wiz_rgb_qrend')+' '+$.i18n('wiz_rgb_qgend')+'
');
- $('#wizp2_footer').html('
');
-
- //open modal
- $("#wizard_modal").modal({
- backdrop : "static",
- keyboard: false,
- show: true
- });
-
- //listen for continue
- $('#btn_wiz_cont').off().on('click',function() {
- beginWizardRGB();
- $('#wizp1').toggle(false);
- $('#wizp2').toggle(true);
- });
+ $("#wiz_canv_color").css('background-color','rgb(0, 255, 0)');
+ requestSetColor('0','255','0');
}
-
- function beginWizardRGB()
+ else
{
- $("#wiz_switchtime_select").off().on('change',function() {
- clearInterval(wIntveralId);
- var time = $("#wiz_switchtime_select").val();
- wIntveralId = setInterval(function() { changeColor(); }, time*1000);
- });
+ $("#wiz_canv_color").css('background-color','rgb(255, 0, 0)');
+ requestSetColor('255','0','0');
+ }
+}
- $('.wselect').change(function () {
- var rgb_order = window.serverConfig.device.colorOrder.split("");
- var redS = $("#wiz_r_select").val();
- var greenS = $("#wiz_g_select").val();
- var blueS = rgb_order.toString().replace(/,/g,"").replace(redS, "").replace(greenS,"");
+function startWizardRGB()
+{
+ //create html
+ $('#wiz_header').html('
'+$.i18n('wiz_rgb_title'));
+ $('#wizp1_body').html('
'+$.i18n('wiz_rgb_title')+' '+$.i18n('wiz_rgb_intro1')+'
'+$.i18n('wiz_rgb_intro2')+'
');
+ $('#wizp1_footer').html('
');
+ $('#wizp2_body').html('
'+$.i18n('wiz_rgb_expl')+'
');
+ $('#wizp2_body').append('
');
+ $('#wizp2_body').append('
'+$.i18n('wiz_rgb_q')+' ');
+ $('#wizp2_body').append('
'+$.i18n('wiz_rgb_qrend')+' '+$.i18n('wiz_rgb_qgend')+'
');
+ $('#wizp2_footer').html('
');
+
+ //open modal
+ $("#wizard_modal").modal({
+ backdrop : "static",
+ keyboard: false,
+ show: true
+ });
+
+ //listen for continue
+ $('#btn_wiz_cont').off().on('click',function() {
+ beginWizardRGB();
+ $('#wizp1').toggle(false);
+ $('#wizp2').toggle(true);
+ });
+}
+
+function beginWizardRGB()
+{
+ $("#wiz_switchtime_select").off().on('change',function() {
+ clearInterval(wIntveralId);
+ var time = $("#wiz_switchtime_select").val();
+ wIntveralId = setInterval(function() { changeColor(); }, time*1000);
+ });
+
+ $('.wselect').change(function () {
+ var rgb_order = window.serverConfig.device.colorOrder.split("");
+ var redS = $("#wiz_r_select").val();
+ var greenS = $("#wiz_g_select").val();
+ var blueS = rgb_order.toString().replace(/,/g,"").replace(redS, "").replace(greenS,"");
+
+ for (var i = 0; i
';
- if(withKodi)
- {
- sendToKodi('playP',"HGradient");
- h +=''+$.i18n('wiz_cc_btn_switchpic')+' ';
- }
- else
- h += ''+$.i18n('wiz_cc_lettvshowm', "gey_1, grey_2, grey_3, HGradient, VGradient")+'
';
- $('#wiz_cc_desc').html(h);
- $('#wiz_cc_btn_sp').off().on('click', function(){
- switchPicture(["VGradient","grey_1","grey_2","grey_3","HGradient"]);
- });
- }
- if(step == 4)
- {
- updateWEditor(["red"]);
- h = $.i18n('wiz_cc_adjustit',$.i18n('edt_conf_color_red_title'));
- if(withKodi)
- {
- h += ''+$.i18n('wiz_cc_testintro')+'
';
- if(withKodi)
- {
- h += ''+$.i18n('wiz_cc_testintrok')+'
';
- sendToKodi('stop');
- for(var i = 0; i ';
- }
- h +='
';
- }
- else
- h += '
'+$.i18n('wiz_cc_testintrowok')+' '+$.i18n('wiz_cc_link')+'
';
- h += '
'+$.i18n('wiz_cc_summary')+'
';
- $('#wiz_cc_desc').html(h);
+ $("#wiz_switchtime_select").append(createSelOpt('5','5'),createSelOpt('10','10'),createSelOpt('15','15'),createSelOpt('30','30'));
+ $("#wiz_switchtime_select").trigger('change');
- $('.videobtn').off().on('click', function(e){
- if(e.target.id == "stop")
- sendToKodi("stop");
- else
- sendToKodi("playV",e.target.id+'.mp4');
+ $("#wiz_r_select").append(createSelOpt("null", ""),createSelOpt('r', $.i18n('general_col_red')),createSelOpt('g', $.i18n('general_col_green')),createSelOpt('b', $.i18n('general_col_blue')));
+ $("#wiz_g_select").html($("#wiz_r_select").html());
+ $("#wiz_r_select").trigger('change');
- $(this).attr("disabled", true);
- setTimeout(function(){$('.videobtn').attr("disabled", false)},10000);
- });
+ requestSetColor('255','0','0');
+ setTimeout(requestSetSource, 100, 'auto');
+ setStorage("wizardactive", true);
- $('#btn_wiz_next').attr("disabled", true);
- $('#btn_wiz_save').toggle(true);
+ $('#btn_wiz_abort').off().on('click', resetWizard);
+
+ $('#btn_wiz_checkok').off().on('click',function() {
+ showInfoDialog('success', "", $.i18n('infoDialog_wizrgb_text'));
+ resetWizard();
+ });
+
+ $('#btn_wiz_save').off().on('click',function() {
+ resetWizard();
+ window.serverConfig.device.colorOrder = new_rgb_order;
+ requestWriteConfig({"device" : window.serverConfig.device});
+ });
+}
+
+$('#btn_wizard_byteorder').off().on('click',startWizardRGB);
+
+//color calibration wizard
+var kodiAddress = document.location.hostname+':8080';
+var wiz_editor;
+var colorLength;
+var cobj;
+var step = 0;
+var withKodi = false;
+var profile = 0;
+var websAddress;
+var imgAddress;
+var vidAddress = "https://sourceforge.net/projects/hyperion-project/files/resources/vid/";
+var picnr = 0;
+var availVideos = ["Sweet_Cocoon","Caminandes_2_GranDillama","Caminandes_3_Llamigos"];
+
+if(getStorage("kodiAddress") != null)
+ kodiAddress = getStorage("kodiAddress");
+
+function switchPicture(pictures)
+{
+ if(typeof pictures[picnr] === 'undefined')
+ picnr = 0;
+
+ sendToKodi('playP',pictures[picnr]);
+ picnr++;
+}
+
+function sendToKodi(type, content, cb)
+{
+ var command;
+
+ if(type == "playP")
+ content = imgAddress+content+'.png';
+ if(type == "playV")
+ content = vidAddress+content;
+
+ if(type == "msg")
+ command = '{"jsonrpc":"2.0","method":"GUI.ShowNotification","params":{"title": "'+$.i18n('wiz_cc_title')+'", "message": "'+content+'", "image":"info", "displaytime":5000 },"id":"1"}';
+ else if (type == "stop")
+ command = '{"jsonrpc":"2.0","method":"Player.Stop","params":{"playerid": 2},"id":"1"}';
+ else if (type == "playP" || type == "playV")
+ command = '{"jsonrpc":"2.0","method":"Player.Open","params":{"item":{"file":"' + content + '"}},"id":"1"}';
+ else if (type == "rotate")
+ command = '{"jsonrpc":"2.0","method":"Player.Rotate","params":{"playerid": 2},"id":"1"}';
+
+ $.ajax({
+ url: 'http://' + kodiAddress + '/jsonrpc',
+ dataType: 'jsonp',
+ crossDomain: true,
+ jsonpCallback: 'jsonCallback',
+ type: 'POST',
+ timeout: 2000,
+ data: 'request=' + encodeURIComponent( command )
+ })
+ .done( function( data, textStatus, jqXHR ) {
+ if ( jqXHR.status == 200 && data['result'] == 'OK' && type == "msg")
+ cb("success");
+ })
+ // Older Versions Of Kodi/XBMC Tend To Fail Due To CORS But Typically If A '200' Is Returned Then It Has Worked!
+ .fail( function( jqXHR, textStatus ) {
+ if ( jqXHR.status != 200 && type == "msg")
+ cb("error")
+ });
+}
+
+function performAction()
+{
+ var h;
+
+ if(step == 1)
+ {
+ $('#wiz_cc_desc').html($.i18n('wiz_cc_chooseid'));
+ updateWEditor(["id"]);
+ $('#btn_wiz_back').attr("disabled", true);
+ }
+ else
+ $('#btn_wiz_back').attr("disabled", false);
+
+ if(step == 2)
+ {
+ updateWEditor(["white"]);
+ h = $.i18n('wiz_cc_adjustit',$.i18n('edt_conf_color_white_title'));
+ if(withKodi)
+ {
+ h += '
'+$.i18n('wiz_cc_kodishould',$.i18n('edt_conf_color_white_title'));
+ sendToKodi('playP',"white");
}
else
- {
- $('#btn_wiz_next').attr("disabled", false);
- $('#btn_wiz_save').toggle(false);
- }
+ h += '
'+$.i18n('wiz_cc_lettvshow',$.i18n('edt_conf_color_white_title'));
+ $('#wiz_cc_desc').html(h);
}
-
- function updateWEditor(el, all)
+ if(step == 3)
{
- for (var key in cobj)
+ updateWEditor(["gammaRed","gammaGreen","gammaBlue"]);
+ h = '
'+$.i18n('wiz_cc_adjustgamma')+'
';
+ if(withKodi)
{
- if(all === true || el[0] == key || el[1] == key || el[2] == key)
- $('#editor_container_wiz [data-schemapath*=".'+profile+'.'+key+'"]').toggle(true);
- else
- $('#editor_container_wiz [data-schemapath*=".'+profile+'.'+key+'"]').toggle(false);
- }
- }
-
- function startWizardCC()
- {
- //create html
- $('#wiz_header').html('
'+$.i18n('wiz_cc_title'));
- $('#wizp1_body').html('
'+$.i18n('wiz_cc_title')+' '+$.i18n('wiz_cc_intro1')+'
'+$.i18n('wiz_cc_kwebs')+' ');
- $('#wizp1_footer').html('
');
- $('#wizp2_body').html('
');
- $('#wizp2_footer').html('
'+$.i18n('general_btn_next')+' ');
-
- //open modal
- $("#wizard_modal").modal({
- backdrop : "static",
- keyboard: false,
- show: true
- });
-
- $('#wiz_cc_kodiip').off().on('change',function() {
- kodiAddress = $(this).val();
- setStorage("kodiAddress", kodiAddress);
- sendToKodi("msg", $.i18n('wiz_cc_kodimsg_start'), function(cb){
- if(cb == "error")
- {
- $('#kodi_status').html('
'+$.i18n('wiz_cc_kodidiscon')+'
'+$.i18n('wiz_cc_kodidisconlink')+' '+$.i18n('wiz_cc_link')+'
');
- withKodi = false;
- }
- else
- {
- $('#kodi_status').html('
'+$.i18n('wiz_cc_kodicon')+'
');
- withKodi = true;
- }
-
- $('#btn_wiz_cont').attr('disabled', false);
- });
- });
-
- //listen for continue
- $('#btn_wiz_cont').off().on('click',function() {
- beginWizardCC();
- $('#wizp1').toggle(false);
- $('#wizp2').toggle(true);
- });
-
- $('#wiz_cc_kodiip').trigger("change");
- colorLength = window.serverConfig.color.channelAdjustment;
- cobj = window.schema.color.properties.channelAdjustment.items.properties;
- websAddress = document.location.hostname+':'+window.serverConfig.webConfig.port;
- imgAddress = 'http://'+websAddress+'/img/cc/';
- setStorage("wizardactive", true);
-
- //check profile count
- if(colorLength.length > 1)
- {
- $('#multi_cali').html('
'+$.i18n('wiz_cc_morethanone')+'
');
- for(var i = 0; i
'+$.i18n('wiz_hue_title'));
- $('#wizp1_body').html(''+$.i18n('wiz_hue_title')+' '+$.i18n('wiz_hue_intro1')+'
');
- $('#wizp1_footer').html('
');
- $('#wh_topcontainer').append(''+$.i18n('wiz_hue_desc1')+'
'+$.i18n('wiz_hue_desc2')+'
'+$.i18n('wiz_hue_press_link')+' '+$.i18n('wiz_cc_btn_switchpic')+' ';
}
else
+ h += ''+$.i18n('wiz_cc_lettvshowm', "gey_1, grey_2, grey_3, HGradient, VGradient")+'
';
+ $('#wiz_cc_desc').html(h);
+ $('#wiz_cc_btn_sp').off().on('click', function(){
+ switchPicture(["VGradient","grey_1","grey_2","grey_3","HGradient"]);
+ });
+ }
+ if(step == 4)
+ {
+ updateWEditor(["red"]);
+ h = $.i18n('wiz_cc_adjustit',$.i18n('edt_conf_color_red_title'));
+ if(withKodi)
{
- $('#wiz_hue_usrstate').html($.i18n('wiz_hue_failure_user'));
- $('#wiz_hue_create_user').toggle(true);
- }
- };
-
- function checkBridgeResult(reply){
- if(reply)
- {
- //abort checking, first reachable result is used
- $('#wiz_hue_ipstate').html("");
- $('#ip').val(hueIPs[hueIPsinc].internalipaddress)
-
- //now check hue user on this bridge
- $('#usrcont').toggle(true);
- checkHueBridge(checkUserResult,$('#user').val() ? $('#user').val() : "newdeveloper");
+ h += ''+$.i18n('wiz_cc_testintro')+'
';
+ if(withKodi)
+ {
+ h += ''+$.i18n('wiz_cc_testintrok')+'
';
+ sendToKodi('stop');
+ for(var i = 0; i ';
+ }
+ h +='
';
+ }
+ else
+ h += '
'+$.i18n('wiz_cc_testintrowok')+' '+$.i18n('wiz_cc_link')+'
';
+ h += '
'+$.i18n('wiz_cc_summary')+'
';
+ $('#wiz_cc_desc').html(h);
+
+ $('.videobtn').off().on('click', function(e){
+ if(e.target.id == "stop")
+ sendToKodi("stop");
+ else
+ sendToKodi("playV",e.target.id+'.mp4');
+
+ $(this).attr("disabled", true);
+ setTimeout(function(){$('.videobtn').attr("disabled", false)},10000);
+ });
+
+ $('#btn_wiz_next').attr("disabled", true);
+ $('#btn_wiz_save').toggle(true);
+ }
+ else
+ {
+ $('#btn_wiz_next').attr("disabled", false);
+ $('#btn_wiz_save').toggle(false);
+ }
+}
+
+function updateWEditor(el, all)
+{
+ for (var key in cobj)
+ {
+ if(all === true || el[0] == key || el[1] == key || el[2] == key)
+ $('#editor_container_wiz [data-schemapath*=".'+profile+'.'+key+'"]').toggle(true);
+ else
+ $('#editor_container_wiz [data-schemapath*=".'+profile+'.'+key+'"]').toggle(false);
+ }
+}
+
+function startWizardCC()
+{
+ //create html
+ $('#wiz_header').html('
'+$.i18n('wiz_cc_title'));
+ $('#wizp1_body').html('
'+$.i18n('wiz_cc_title')+' '+$.i18n('wiz_cc_intro1')+'
'+$.i18n('wiz_cc_kwebs')+' ');
+ $('#wizp1_footer').html('
');
+ $('#wizp2_body').html('
');
+ $('#wizp2_footer').html('
'+$.i18n('general_btn_next')+' ');
+
+ //open modal
+ $("#wizard_modal").modal({
+ backdrop : "static",
+ keyboard: false,
+ show: true
+ });
+
+ $('#wiz_cc_kodiip').off().on('change',function() {
+ kodiAddress = $(this).val();
+ setStorage("kodiAddress", kodiAddress);
+ sendToKodi("msg", $.i18n('wiz_cc_kodimsg_start'), function(cb){
+ if(cb == "error")
+ {
+ $('#kodi_status').html('
'+$.i18n('wiz_cc_kodidiscon')+'
'+$.i18n('wiz_cc_kodidisconlink')+' '+$.i18n('wiz_cc_link')+'
');
+ withKodi = false;
}
else
{
- $('#usrcont').toggle(false);
- $('#wiz_hue_ipstate').html($.i18n('wiz_hue_failure_ip'));
- }
- }
- };
-
- function assignHuePos(id, pos, inc)
- {
- var i = null;
-
- if(pos == "top")
- i = huePosTop;
- else if(pos == "bottom")
- i = huePosBottom;
- else if(pos == "left")
- i = huePosLeft;
- else if(pos == "right")
- i = huePosRight;
- else
- i = huePosEntire;
-
- i.index = inc;
- return i;
- }
-
- function identHueId(id, off)
- {
- var on = true;
- if(off !== true)
- setTimeout(identHueId,1500,id,true);
- else
- on = false;
-
- $.ajax({
- url: 'http://'+$('#ip').val()+'/api/'+$('#user').val()+'/lights/'+id+'/state',
- type: 'PUT',
- timeout: 2000,
- data: ' {"on":'+on+', "sat":254, "bri":254,"hue":47000}'
- })
- }
-
- function getHueIPs(){
- $('#wiz_hue_ipstate').html($.i18n('wiz_hue_searchb'));
- $.ajax({
- url: 'https://discovery.meethue.com',
- crossDomain: true,
- type: 'GET',
- timeout: 3000
- })
- .done( function( data, textStatus, jqXHR ) {
- if(data.length == 0)
- $('#wiz_hue_ipstate').html($.i18n('wiz_hue_failure_ip'));
- else
- {
- hueIPs = data;
- checkHueBridge(checkBridgeResult);
- }
- })
- .fail( function( jqXHR, textStatus ) {
- $('#wiz_hue_ipstate').html($.i18n('wiz_hue_failure_ip'));
- });
- };
-
- function beginWizardHue()
- {
- var usr = conf_editor.getEditor("root.specificOptions.username").getValue();
- if(usr != "")
- {
- $('#user').val(usr);
- }
-
- //check if ip is empty/reachable/search for bridge
- if(conf_editor.getEditor("root.specificOptions.output").getValue() == "")
- getHueIPs();
- else
- {
- var ip = conf_editor.getEditor("root.specificOptions.output").getValue();
- $('#ip').val(ip);
- hueIPs.push({internalipaddress : ip});
- checkHueBridge(checkBridgeResult);
- }
-
- $('#retry_bridge').off().on('click', function(){
- hueIPs.push({internalipaddress : $('#ip').val()});
- hueIPsinc = 0;
- checkHueBridge(checkBridgeResult);
- });
-
- $('#retry_usr').off().on('click', function(){
- checkHueBridge(checkUserResult,$('#user').val() ? $('#user').val() : "newdeveloper");
- });
-
- $('#wiz_hue_create_user').off().on('click',function() {
- createHueUser();
- });
-
- $('#btn_wiz_save').off().on("click", function(){
- var hueLedConfig = [];
- var finalLightIds = [];
-
- //create hue led config
- var incC = 0;
- for(var key in lightIDs)
- {
- if($('#hue_'+key).val() != "disabled")
- {
- hueLedConfig.push(assignHuePos(key, $('#hue_'+key).val(), incC));
- finalLightIds.push(parseInt(key));
- incC++;
- }
+ $('#kodi_status').html('
'+$.i18n('wiz_cc_kodicon')+'
');
+ withKodi = true;
}
- window.serverConfig.leds = hueLedConfig;
-
- //Adjust gamma, brightness and compensation
- var c = window.serverConfig.color.channelAdjustment[0];
- c.gammaBlue = 1.0;
- c.gammaRed = 1.0;
- c.gammaGreen = 1.0;
- c.brightness = 100;
- c.brightnessCompensation = 0;
-
- //device config
- var d = window.serverConfig.device;
- d.output = $('#ip').val();
- d.lightIds = finalLightIds;
- d.username = $('#user').val();
- d.type = "philipshue";
- d.transitiontime = 1;
- d.switchOffOnBlack = true;
-
- //smoothing off
- window.serverConfig.smoothing.enable = false;
-
- requestWriteConfig(window.serverConfig, true);
- resetWizard();
+ $('#btn_wiz_cont').attr('disabled', false);
});
+ });
- $('#btn_wiz_abort').off().on('click', resetWizard);
- }
-
- function createHueUser()
- {
- var connectionRetries = 30;
- var data = {"devicetype":"hyperion#"+Date.now()};
- var UserInterval = setInterval(function(){
- $.ajax({
- type: "POST",
- url: 'http://'+$("#ip").val()+'/api',
- processData: false,
- timeout: 1000,
- contentType: 'application/json',
- data: JSON.stringify(data),
- success: function(r) {
- $('#wizp1').toggle(false);
- $('#wizp2').toggle(false);
- $('#wizp3').toggle(true);
-
- connectionRetries--;
- $("#connectionTime").html(connectionRetries);
- if(connectionRetries == 0) {
- abortConnection(UserInterval);
- }
- else
- {
- if (typeof r[0].error != 'undefined') {
- console.log(connectionRetries+": link not pressed");
- }
- if (typeof r[0].success != 'undefined') {
- $('#wizp1').toggle(false);
- $('#wizp2').toggle(true);
- $('#wizp3').toggle(false);
- $('#user').val(r[0].success.username);
- checkHueBridge(checkUserResult,r[0].success.username);
- clearInterval(UserInterval);
- }
- }
- },
- error: function(XMLHttpRequest, textStatus, errorThrown) {
- $('#wizp1').toggle(false);
- $('#wizp2').toggle(true);
- $('#wizp3').toggle(false);
- clearInterval(UserInterval);
- }
- });
- },1000);
- }
-
- function get_hue_lights(){
- $.ajax({
- type: "GET",
- url: 'http://'+$("#ip").val()+'/api/'+$("#user").val()+'/lights',
- processData: false,
- contentType: 'application/json',
- success: function(r) {
- if(Object.keys(r).length > 0)
- {
- $('#wh_topcontainer').toggle(false);
- $('#hue_ids_t, #btn_wiz_save').toggle(true);
- lightIDs = r;
-
- for(var lightid in r)
- {
- $('.lidsb').append(createTableRow([lightid+' ('+r[lightid].name+')', '
'+$.i18n('wiz_hue_ids_disabled')+' '+$.i18n('conf_leds_layout_cl_top')+' '+$.i18n('conf_leds_layout_cl_bottom')+' '+$.i18n('conf_leds_layout_cl_left')+' '+$.i18n('conf_leds_layout_cl_right')+' '+$.i18n('wiz_hue_ids_entire')+' ','
'+$.i18n('wiz_hue_blinkblue',lightid)+' ']));
- }
-
- $('.hue_sel_watch').bind("change", function(){
- var cC = 0;
- for(var key in lightIDs)
- {
- if($('#hue_'+key).val() != "disabled")
- {
- cC++;
- }
- }
- cC == 0 ? $('#btn_wiz_save').attr("disabled",true) : $('#btn_wiz_save').attr("disabled",false);
- });
-
- $('.hue_sel_watch').trigger('change');
- }
- else
- {
- $('#wizp2_body').html('
'+$.i18n('wiz_hue_noids')+' ')
- }
- }
- });
- }
-
- function abortConnection(UserInterval){
- clearInterval(UserInterval);
+ //listen for continue
+ $('#btn_wiz_cont').off().on('click',function() {
+ beginWizardCC();
$('#wizp1').toggle(false);
$('#wizp2').toggle(true);
- $('#wizp3').toggle(false);
- $("#wiz_hue_usrstate").html($.i18n('wiz_hue_failure_connection'));
+ });
+
+ $('#wiz_cc_kodiip').trigger("change");
+ colorLength = window.serverConfig.color.channelAdjustment;
+ cobj = window.schema.color.properties.channelAdjustment.items.properties;
+ websAddress = document.location.hostname+':'+window.serverConfig.webConfig.port;
+ imgAddress = 'http://'+websAddress+'/img/cc/';
+ setStorage("wizardactive", true);
+
+ //check profile count
+ if(colorLength.length > 1)
+ {
+ $('#multi_cali').html('
'+$.i18n('wiz_cc_morethanone')+'
');
+ for(var i = 0; i
'+$.i18n('wiz_hue_title'));
+ $('#wizp1_body').html(''+$.i18n('wiz_hue_title')+' '+$.i18n('wiz_hue_intro1')+'
');
+ $('#wizp1_footer').html('
');
+ $('#wh_topcontainer').append(''+$.i18n('wiz_hue_desc1')+'
'+$.i18n('wiz_hue_desc2')+'
'+$.i18n('wiz_hue_press_link')+' '+$.i18n('wiz_hue_ids_disabled')+' '+$.i18n('conf_leds_layout_cl_top')+' '+$.i18n('conf_leds_layout_cl_bottom')+' '+$.i18n('conf_leds_layout_cl_left')+' '+$.i18n('conf_leds_layout_cl_right')+' '+$.i18n('wiz_hue_ids_entire')+' '+$.i18n('wiz_hue_blinkblue',lightid)+' ']));
+ }
+
+ $('.hue_sel_watch').bind("change", function(){
+ var cC = 0;
+ for(var key in lightIDs)
+ {
+ if($('#hue_'+key).val() != "disabled")
+ {
+ cC++;
+ }
+ }
+ cC == 0 ? $('#btn_wiz_save').attr("disabled",true) : $('#btn_wiz_save').attr("disabled",false);
+ });
+
+ $('.hue_sel_watch').trigger('change');
+ }
+ else
+ {
+ $('#wizp2_body').html(''+$.i18n('wiz_hue_noids')+' ')
+ }
+ }
+ });
+}
+
+function abortConnection(UserInterval){
+ clearInterval(UserInterval);
+ $('#wizp1').toggle(false);
+ $('#wizp2').toggle(true);
+ $('#wizp3').toggle(false);
+ $("#wiz_hue_usrstate").html($.i18n('wiz_hue_failure_connection'));
+}
diff --git a/config/hyperion.config.json.commented b/config/hyperion.config.json.commented
index 3080c4f2..bc94c3fa 100644
--- a/config/hyperion.config.json.commented
+++ b/config/hyperion.config.json.commented
@@ -309,6 +309,7 @@
"network" :
{
"internetAccessAPI" : false,
+ "restirctedInternetAccessAPI" : false,
"ipWhitelist" : [],
"apiAuth" : true,
"localApiAuth" : false
diff --git a/config/hyperion.config.json.default b/config/hyperion.config.json.default
index 520fcde9..ddc1fdde 100644
--- a/config/hyperion.config.json.default
+++ b/config/hyperion.config.json.default
@@ -178,6 +178,7 @@
"network" :
{
"internetAccessAPI" : false,
+ "restirctedInternetAccessAPI" : false,
"ipWhitelist" : [],
"apiAuth" : true,
"localApiAuth" : false
diff --git a/libsrc/hyperion/schema/schema-network.json b/libsrc/hyperion/schema/schema-network.json
index cbf2e58d..922ba0e5 100644
--- a/libsrc/hyperion/schema/schema-network.json
+++ b/libsrc/hyperion/schema/schema-network.json
@@ -25,6 +25,19 @@
},
"propertyOrder" : 2
},
+ "restirctedInternetAccessAPI" :
+ {
+ "type" : "boolean",
+ "title" : "edt_conf_net_restirctedInternetAccessAPI_title",
+ "required" : true,
+ "default" : false,
+ "options": {
+ "dependencies": {
+ "internetAccessAPI": true
+ }
+ },
+ "propertyOrder" : 3
+ },
"ipWhitelist" :
{
"type" : "array",
@@ -36,10 +49,10 @@
},
"options": {
"dependencies": {
- "internetAccessAPI": false
+ "restirctedInternetAccessAPI": true
}
},
- "propertyOrder" : 3
+ "propertyOrder" : 4
},
"localApiAuth" :
{
@@ -52,7 +65,7 @@
"apiAuth": true
}
},
- "propertyOrder" : 4
+ "propertyOrder" : 5
}
},
"additionalProperties" : false