diff --git a/app.js b/app.js index 9d0121a..3641a28 100644 --- a/app.js +++ b/app.js @@ -67,7 +67,7 @@ var console = { }; if (typeof(CreateObject) !== "function") { - var CreateObject = function(progId, serverName) { + var CreateObject = function(progId, serverName, callback) { var progIds = []; var _CreateObject = function(p, s) { if (typeof(WScript) !== "undefined") { @@ -85,7 +85,11 @@ if (typeof(CreateObject) !== "function") { for (var i = 0; i < progIds.length; i++) { try { - return _CreateObject(progIds[i], serverName); + var obj = _CreateObject(progIds[i], serverName); + if (typeof(callback) === "function") { + callback(obj, progIds[i]); + } + return obj; } catch (e) { console.error(e.message); }; diff --git a/app/index.js b/app/index.js index b64ccda..0f20b25 100644 --- a/app/index.js +++ b/app/index.js @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////// -// WebPage +// index.js //////////////////////////////////////////////////////////////////////// var CONFIG = require("lib/config"); var FILE = require("lib/file"); @@ -10,239 +10,105 @@ var SHELL = require("lib/shell"); var LDPlayer = require("lib/ldplayer"); var NoxPlayer = require("lib/noxplayer"); -var apiUrl = CONFIG.readConfig("/ApiUrl").first().getText(); var token, userId; +var apiUrl = CONFIG.readConfig("/ApiUrl").first().getText(); var servers = []; var applications = []; -var assignStaticIP = function() { - SHELL.runWindow("cscript app.js shadow"); -}; - -var showLocalApplications = function() { - var localApplications = []; - - // LDPlayer - var LDPList = LDPlayer.getList(); - for (var i = 0; i < LDPList.length; i++) { - localApplications.push({ - name: "LDPlayer", - uniqueId: LDPList[i].title - }); - } - - // NoxPlayer - var NoxPList = NoxPlayer.getList(); - for (var i = 0; i < NoxPList.length; i++) { - localApplications.push({ - name: "NoxPlayer", - uniqueId: NoxPList[i].hostname - }); - } - - // Chrome - localApplications.push({ - name: "Chrome", - uniqueId: "John" - }); - localApplications.push({ - name: "Chrome", - uniqueId: "James" - }); - localApplications.push({ - name: "Chrome", - uniqueId: "Jasmine" - }); - - var template = $("#listview_applications .template"); - for (var i = 0; i < servers.length; i++) { - template.find("select").append($("