From 0ddc432f073bdfd17268f689653ec7c40879f663 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 8 May 2013 16:38:50 +0000 Subject: [PATCH] fixed bug with jqueryLoad and socketLoad --- json/config.json | 6 +++--- lib/client/dom.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/json/config.json b/json/config.json index 5f9fc6cf..b012c13a 100644 --- a/json/config.json +++ b/json/config.json @@ -12,9 +12,9 @@ "show_keys_panel" : true, "server" : true, "socket" : true, - "port" : 80, - "sslPort" : 443, + "port" : 8000, + "sslPort" : 4430, "ip" : null, "ssl" : false, "rest" : true -} \ No newline at end of file +} diff --git a/lib/client/dom.js b/lib/client/dom.js index 85bdedcc..71fe8775 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -901,16 +901,16 @@ var CloudCmd, Util, DOM, CloudFunc; */ this.jqueryLoad = function(pCallBack){ /* загружаем jquery: */ - this.jsload('//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js',{ + Loader.jsload('//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js',{ onload: Util.retExec(pCallBack), onerror: function(){ - this.jsload('/lib/client/jquery.js'); + Loader.jsload('/lib/client/jquery.js'); /* if could not load jquery from google server * maybe we offline, load font from local * directory */ - this.cssSet({ + Loader.cssSet({ id :'local-droids-font', element : document.head, inner : '@font-face {font-family: "Droid Sans Mono";' + @@ -927,7 +927,7 @@ var CloudCmd, Util, DOM, CloudFunc; * @param pCallBack */ this.socketLoad = function(pCallBack){ - this.jsload('/lib/client/socket.js', Util.retExec(pCallBack) ); + Loader.jsload('/lib/client/socket.js', Util.retExec(pCallBack) ); }; }, CmdProto = function(){