Changeset 53ae001

Timestamp:

2014-02-07 09:32:32 (11 years ago)

Author:

jullio <jullio@…>

Branches:

master

Children:

635e370

Parents:

94fc6ce

git-author:

jullio <jullio@…> (2014-02-07 09:32:32)

git-committer:

jullio <jullio@…> (2014-02-07 09:32:32)

Message:

1.9.2 Changed config tab. Made drop downs ordered alphabetically.

File:

• J_OnkyoReceiver1.js (modified) (4 diffs)

J_OnkyoReceiver1.js ¶

@@ -11 +11 @@
 var responseRAW;
 var netIndexcmd;
-var netServiceNames = {
-    "?" : "None",
-    "00":"DLNA",
-    "01": "Favorite",
-    "02": "vTuner",
-    "03" : "SiriusXM",
-    "04" : "Pandora",
-    "05" : "Rhapsody",
-    "06" : "Last.fm",
-    "07" : "Napster",
-    "08" : "Slacker",
-    "09" : "Mediafly",
-    "0A" : "Spotify",
-    "0B" : "AUPEO!",
-    "0C" : "radiko",
-    "0D" : "e-onkyo",
-    "0E" : "TuneIn Radio",
-    "0F" : "MP3Tunes",
-    "10" : "Simfy",
-    "11" : "Home Media"
-};
-var netInputSource = {
-    "?" : "None",
-    "29" : "USBFront",
-    "2A" : "USBRear",
-    "2B" : "NET",
-    "2D" : "Airplay",
-    "31" : "XM",
-    "32" : "Sirius"
-};
-
-var InputSource = {
-    "?" : "None",
-    "00" : "STB/DVR",
-    "01" : "CBL/SAT",
-    "02" : "GAME/TV",
-    "03" : "AUX",
-    "05" : "PC",
-    "10" : "BD/DVD",
-    "20" : "TV/TAPE",
-    "22" : "PHONO",
-    "23" : "TV/CD",
-    "24" : "FM",
-    "25" : "AM",
-    "29" : "USBFront",
-    "2A" : "USBRear",
-    "2B" : "NET",
-    "2D" : "Airplay",
-    "31" : "XM",
-    "32" : "Sirius",
-    "RAW": "Raw Commands"
-};
-
-var debugModes = {
-    "0": "Off",
-    "1": "On"
-};
-
-var logLevels = {
-    "0": "0:Minimal logs(recomended)",
-    "1": "1:Critical feature logging.",
-    "2": "2:Advanced feature logging.",
-    "3": "3: Log almost everything.",
-    "4": "4: Log everything."
-};
+var netServiceNames = [
+    "?:None",
+    "0B:AUPEO!",
+    "00:DLNA",
+    "0D:e-onkyo",
+    "01:Favorite",
+    "11:Home Media",
+    "06:Last.fm",
+    "09:Mediafly",
+    "0F:MP3Tunes",
+    "07:Napster",
+    "04:Pandora",
+    "0C:radiko",
+    "05:Rhapsody",
+    "10:Simfy",
+    "03:SiriusXM",
+    "08:Slacker",
+    "0A:Spotify",
+    "0E:TuneIn Radio",
+    "02:vTuner"
+];
+/*var netInputSource = [
+    "?:None",
+    "29:USBFront",
+    "2A:USBRear",
+    "2B:NET",
+    "2D:Airplay",
+    "31:XM",
+    "32:Sirius"
+];*/
+
+var InputSource = [
+    "?:None",
+    "2D:Airplay",
+    "25:AM",
+    "03:AUX",
+    "10:BD/DVD",
+    "01:CBL/SAT",
+    "24:FM",
+    "02:GAME/TV",
+    "2B:NET",
+    "05:PC",
+    "22:PHONO",
+    "RAW:Raw Commands",
+    "32:Sirius",
+    "00:STB/DVR",
+    "23:TV/CD",
+    "20:TV/TAPE",
+    "29:USBFront",
+    "2A:USBRear",
+    "31:XM"
+];
+
+var debugModes = [
+    "0:Off",
+    "1:On"
+];
+
+var logLevels = [
+    "0:0-Minimal logs(recomended)",
+    "1:1-Critical feature logging.",
+    "2:2-Advanced feature logging.",
+    "3:3-Log almost everything.",
+    "4:4-Log everything."
+];
 
 function config_init(deviceId){
@@ -102 +102 @@
         if(debugmode == undefined){ debugmode = 0; }
         if(loglevel == undefined) { loglevel = 0; }
-    html += '<br>Dubug Mode: ';
+    html += ' Dubug Mode: ';
         html += generateSelectStatement('DEBUGMODE','warnSave(); set_device_state(' + deviceId + ',\'' + ONK_OIN + '\',\'DEBUGMODE\', $F(this), 0)',debugModes,debugmode,0);
         html += '  Log Level: ' + generateSelectStatement('LOGLEVEL','warnSave(); set_device_state(' + deviceId + ',\'' + ONK_OIN + '\',\'LOGLEVEL\', $F(this), 0)',logLevels,loglevel,0);
@@ -108 +108 @@
     }
    html += '<div><p><b>Macro (For Advanced Users) - **Beta**</b></p></div>';
-   html += '<div><p>Macros are a set of commands to play a specific song or select a specific menu item.  You can select any input.  If you select Net as your input you can select any of the listed Net Service.';
-   html += 'The Macro Steps only apply to Net input source and Raw input source. Explanation of Pauses and Raw Commands are in the instructions.</p></div>';
+   html += '<div><p>Macros are a set of commands. You can select any input. ';
+   html += 'The Macro Steps only apply to Net input source and Raw input source. Explanation of Pause and Raw Commands are in the instructions.</p></div>';
    
    var macroInput1 = get_device_state(deviceId, ONK_OIN, "MacroInput1", 1);
@@ -238 +238 @@
     }
     select += ' ' + disabled +'>';
-    for (key in OptionNameValues){
-        if(key == selectedValue){
-            select += '<option value="' + key + '" selected="selected">' + OptionNameValues[key] + '</option>';
+    for (var i=0; i<OptionNameValues.length;i++){
+        var keyvalarr = OptionNameValues[i].split(":");
+        if(keyvalarr[0] == selectedValue){
+            select += '<option value="' + keyvalarr[0] + '" selected="selected">' + keyvalarr[1] + '</option>';
         }else{
-            select += '<option value="' + key + '">' + OptionNameValues[key] + '</option>';
+            select += '<option value="' + keyvalarr[0] + '">' + keyvalarr[1] + '</option>';
         }
     }