Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 10:45:47 +00:00
Code Issues Projects Releases Wiki Activity

changed default ip to null so IP would be geted from config.json only if it setted up

Browse source
This commit is contained in:
coderaiser 2012-11-28 03:48:45 -05:00
parent 778fb8ebbb
commit 8c4d0cc599
7 changed files with 53 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -124,6 +124,9 @@ in any position in anyLoadOnLoad function.
* Added chainable to Cache object in DOM.
* Changed default ip to null so IP would be geted from
config.json only if it setted up.
2012.10.01, Version 0.1.7

2
client.js
View file

@ -52,7 +52,7 @@ var CloudClient = {
OLD_BROWSER : false,
HOST : (function(){
var lLocation = document.location;
var lLocation = document.location;
return lLocation.protocol + '//' + lLocation.host;
})()
};

2
config.json
View file

@ -14,6 +14,6 @@
"logs" : false,
"socket" : true,
"port" : 80,
"ip" : "127.0.0.1",
"ip" : null,
"rest" : true
}

3
lib/client/editor/_codemirror.js
View file

@ -99,8 +99,7 @@ var CloudCommander, Util, DOM, CloudFunc, CodeMirror;
console.timeEnd('codemirror load');
CodeMirrorLoaded = true;
Util.exec(pCallBack);
});
});
}
/**

21
lib/client/menu.js
View file

@ -106,15 +106,16 @@ var CloudCommander, Util, DOM, CloudFunc, $;
function load(pCallBack){
console.time('menu load');
var lDir = Menu.dir;
var lDir = Menu.dir,
lFiles = [
lDir + 'contextMenu.js',
lDir + 'contextMenu.css'
];
DOM.anyLoadInParallel([
lDir + 'contextMenu.js',
lDir + 'contextMenu.css'],
function(){
console.timeEnd('menu load');
Util.exec(pCallBack);
});
DOM.anyLoadInParallel(lFiles, function(){
console.timeEnd('menu load');
Util.exec(pCallBack);
});
}
function set(){
@ -205,7 +206,7 @@ var CloudCommander, Util, DOM, CloudFunc, $;
load
]));
var key_event = (function(pEvent){
var key_event = function(pEvent){
/* если клавиши можно обрабатывать */
if( KeyBinding.get() ){
/* if shift + F10 pressed */
@ -219,7 +220,7 @@ var CloudCommander, Util, DOM, CloudFunc, $;
}
else if (pEvent.keyCode === cloudcmd.KEY.ESC)
KeyBinding.set();
});
};
/* добавляем обработчик клавишь */
DOM.addKeyListener( key_event );

23
lib/client/storage/_github.js
View file

@ -28,17 +28,18 @@ var CloudCommander, Util, DOM, $, Github, cb;
function load(pCallBack){
console.time('github load');
var lDir = './lib/client/storage/github/';
DOM.anyLoadInParallel([
lDir + 'github.js',
lDir + 'lib/base64.js',
lDir + 'lib/underscore.js'],
function(){
console.timeEnd('github load');
DOM.Images.hideLoad();
Util.exec(pCallBack);
var lDir = './lib/client/storage/github/',
lFiles = [
lDir + 'github.js',
lDir + 'lib/base64.js',
lDir + 'lib/underscore.js'
];
DOM.anyLoadInParallel(lFiles, function(){
console.timeEnd('github load');
DOM.Images.hideLoad();
Util.exec(pCallBack);
});
}

48
lib/client/terminal.js
View file

@ -22,34 +22,34 @@ var CloudCommander, Util, DOM, $;
function load(pCallBack){
console.time('terminal load');
var lDir = 'lib/client/terminal/jquery-terminal/jquery.';
var lDir = 'lib/client/terminal/jquery-terminal/jquery.',
lFiles = [
lDir + 'terminal.js',
lDir + 'mousewheel.js',
lDir + 'terminal.css'
];
DOM.anyLoadInParallel([
lDir + 'terminal.js',
lDir + 'mousewheel.js',
lDir + 'terminal.css'],
DOM.anyLoadInParallel(lFiles, function(){
console.timeEnd('terminal load');
init();
function(){
console.timeEnd('terminal load');
init();
$(function($, undefined) {
Term = JqueryTerminal.Term = $('#terminal').terminal(function(command, term){
term.echo('');
cloudcmd.Socket.send(command);
}, {
greetings : '[[;#729FCF;]Cloud Commander Terminal]',
prompt : '[[;#729FCF;]cloudcmd> ]',
color : '#729FCF;'
});
$(function($, undefined) {
Term = JqueryTerminal.Term = $('#terminal').terminal(function(command, term){
term.echo('');
cloudcmd.Socket.send(command);
}, {
greetings : '[[;#729FCF;]Cloud Commander Terminal]',
prompt : '[[;#729FCF;]cloudcmd> ]',
color : '#729FCF;'
});
/* removing resize function, no need for us */
Term.resize = function(){};
$(window).unbind('resize');
Util.exec(pCallBack.callback || pCallBack);
});
/* removing resize function, no need for us */
Term.resize = function(){};
$(window).unbind('resize');
Util.exec(pCallBack.callback || pCallBack);
});
}
/**