diff --git a/lib/client.js b/lib/client.js index 3e7c61ab..e9f56c6b 100644 --- a/lib/client.js +++ b/lib/client.js @@ -85,7 +85,7 @@ var loadModule = function(pParams){ if(lPath && !lName){ lName = lPath[0].toUpperCase() + lPath.substring(1); - lName = lName.replace('.js', ''); + lName = Util.removeStr(lName, '.js'); var lSlash = lName.indexOf('/'); if(lSlash > 0){ @@ -99,12 +99,11 @@ var loadModule = function(pParams){ if(!cloudcmd[lName]) cloudcmd[lName] = function(pArg){ - Util.exec(lDoBefore); return DOM.jsload(cloudcmd.LIBDIRCLIENT + lPath, lFunc || function(){ - cloudcmd[lName].Keys(pArg); + cloudcmd[lName].init(pArg); }); }; else diff --git a/lib/client/editor/_codemirror.js b/lib/client/editor/_codemirror.js index 63ed80c8..8efe50a3 100644 --- a/lib/client/editor/_codemirror.js +++ b/lib/client/editor/_codemirror.js @@ -214,7 +214,7 @@ var CloudCommander, Util, DOM, CloudFunc, CodeMirror; /** * function bind keys */ - cloudcmd.Editor.Keys = function(pReadOnly){ + cloudcmd.Editor.init = function(pReadOnly){ ReadOnly = pReadOnly; CodeMirrorEditor.show(); diff --git a/lib/client/menu.js b/lib/client/menu.js index 8a79edff..933ba63c 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -198,7 +198,7 @@ var CloudCommander, Util, DOM, CloudFunc, $; }; /* key binding function */ - Menu.Keys = function(pPosition){ + Menu.init = function(pPosition){ Position = pPosition; DOM.jqueryLoad( Util.retLoadOnLoad([ diff --git a/lib/client/storage/_github.js b/lib/client/storage/_github.js index aa0d9178..a738c161 100644 --- a/lib/client/storage/_github.js +++ b/lib/client/storage/_github.js @@ -159,7 +159,7 @@ var CloudCommander, Util, DOM, $, Github, cb; User.show(null, lShowUserInfo); } - Storage.Keys = function(){ + Storage.init = function(){ Util.loadOnLoad([ getUserData, init, diff --git a/lib/client/terminal.js b/lib/client/terminal.js index 04a862d5..ad11b84b 100644 --- a/lib/client/terminal.js +++ b/lib/client/terminal.js @@ -98,7 +98,7 @@ var CloudCommander, Util, DOM, $; /** * function bind keys */ - cloudcmd.Terminal.Keys = function(){ + cloudcmd.Terminal.init = function(){ /* loading js and css*/ DOM.jqueryLoad( Util.retLoadOnLoad([ JqueryTerminal.show, diff --git a/lib/client/viewer.js b/lib/client/viewer.js index 194e143b..d2c62cb6 100644 --- a/lib/client/viewer.js +++ b/lib/client/viewer.js @@ -187,7 +187,7 @@ var CloudCommander, Util, DOM, CloudFunc, $; } }; - cloudcmd.Viewer.Keys = function(){ + cloudcmd.Viewer.init = function(){ DOM.jqueryLoad( Util.retLoadOnLoad([ FancyBox.show, FancyBox.load