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

fixed bug with moving back and forward

Browse source
This commit is contained in:
coderaiser 2013-02-22 05:15:46 -05:00
parent 23f2368141
commit f385474717
3 changed files with 149 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/client.js
View file

@ -317,7 +317,7 @@ function baseInit(pCallBack){
/* загружаем общие функции для клиента и сервера */
DOM.jsload(CloudCmd.LIBDIR + 'cloudfunc.js',function(){
DOM.addListener("popstate", function(pEvent) {
var lPath = pEvent.state;
var lPath = pEvent.state + '?json';
if(lPath)
CloudCmd._ajaxLoad(lPath, {nohistory: true});

23
lib/client/dom.js
View file

@ -110,17 +110,18 @@ var CloudCommander, Util,
var lRet = this,
lElement = (pElement || window);
lElement.addEventListener(
pType,
pListener,
pUseCapture
);
Listeners.push({
element : lElement,
callback: pListener
});
if( lElement.addEventListener){
lElement.addEventListener(
pType,
pListener,
pUseCapture
);
Listeners.push({
element : lElement,
callback: pListener
});
}
return lRet;
};

272
lib/client/terminal.js
View file

@ -1,136 +1,136 @@
var CloudCommander, Util, DOM, $;
/* object contains terminal jqconsole */
(function(CloudCmd, Util, DOM){
'use strict';
var KeyBinding = CloudCmd.KeyBinding,
TerminalId,
Term,
Hidden = false,
JqueryTerminal = {};
CloudCmd.Terminal = {};
/* PRIVATE FUNCTIONS */
/**
* function loads jquery-terminal
*/
function load(pCallBack){
console.time('terminal load');
var lDir = '/lib/client/terminal/jquery-terminal/jquery.',
lFiles = [
lDir + 'terminal.js',
lDir + 'mousewheel.js',
lDir + 'terminal.css'
],
lJqueryMigrate = '//code.jquery.com/jquery-migrate-1.0.0.js';
/* //github.com/jquery/jquery-migrate/ */
DOM.anyLoadOnLoad([lFiles, lJqueryMigrate], 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;'
});
});
/* removing resize function, no need for us */
Term.resize = function(){};
$(window).unbind('resize');
Util.exec(pCallBack);
}).cssSet({id:'terminalStyle',
inner: '.cloudTerminal{' +
'height: 720px;' +
'};'
});
}
/**
* function do basic initialization
*/
function init(){
if(!TerminalId)
TerminalId = DOM.anyload({
name : 'div',
id : 'terminal',
className : 'panel cloudTerminal',
parent : DOM.getFM()
});
}
/* PUBLIC FUNCTIONS */
/**
* functin show jquery-terminal
*/
JqueryTerminal.show = function(){
DOM.Images.hideLoad();
/* only if panel was hided */
if( DOM.hidePanel() ){
Hidden = false;
DOM.show(TerminalId);
KeyBinding.unSet();
Term.resume();
}
};
/**
* function hide jquery-terminal
*/
JqueryTerminal.hide = function(){
Hidden = true;
DOM.hide(TerminalId);
DOM.showPanel();
KeyBinding.set();
Term.pause();
};
/**
* function bind keys
*/
CloudCmd.Terminal.init = function(){
/* loading js and css*/
Util.loadOnLoad([
JqueryTerminal.show,
load,
DOM.socketLoad,
DOM.jqueryLoad,
]);
/* добавляем обработчик клавишь */
var lKeyHandler = function(pEvent){
var lRet = true,
lKEY = CloudCmd.KEY,
lKeyCode = pEvent.keyCode,
lKeyBinded = KeyBinding.get();
/* если клавиши можно обрабатывать */
if(Hidden && lKeyBinded && lKeyCode === lKEY.TRA){
JqueryTerminal.show();
pEvent.preventDefault();
lRet = false;
}
else if(!Hidden && lKeyCode === lKEY.ESC)
JqueryTerminal.hide();
return lRet;
};
DOM.addKeyListener(lKeyHandler);
};
CloudCmd.Terminal.JqueryTerminal = JqueryTerminal;
})(CloudCommander, Util, DOM);
var CloudCommander, Util, DOM, $;
/* object contains terminal jqconsole */
(function(CloudCmd, Util, DOM){
'use strict';
var KeyBinding = CloudCmd.KeyBinding,
TerminalId,
Term,
Hidden = false,
JqueryTerminal = {};
CloudCmd.Terminal = {};
/* PRIVATE FUNCTIONS */
/**
* function loads jquery-terminal
*/
function load(pCallBack){
console.time('terminal load');
var lDir = '/lib/client/terminal/jquery-terminal/jquery.',
lFiles = [
lDir + 'terminal.js',
lDir + 'mousewheel.js',
lDir + 'terminal.css'
],
lJqueryMigrate = '//code.jquery.com/jquery-migrate-1.0.0.js';
/* //github.com/jquery/jquery-migrate/ */
DOM.anyLoadOnLoad([lFiles, lJqueryMigrate], 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;'
});
});
/* removing resize function, no need for us */
Term.resize = function(){};
$(window).unbind('resize');
Util.exec(pCallBack);
}).cssSet({id:'terminalStyle',
inner: '.cloudTerminal{' +
'height: 720px;' +
'};'
});
}
/**
* function do basic initialization
*/
function init(){
if(!TerminalId)
TerminalId = DOM.anyload({
name : 'div',
id : 'terminal',
className : 'panel cloudTerminal',
parent : DOM.getFM()
});
}
/* PUBLIC FUNCTIONS */
/**
* functin show jquery-terminal
*/
JqueryTerminal.show = function(){
DOM.Images.hideLoad();
/* only if panel was hided */
if( DOM.hidePanel() ){
Hidden = false;
DOM.show(TerminalId);
KeyBinding.unSet();
Term.resume();
}
};
/**
* function hide jquery-terminal
*/
JqueryTerminal.hide = function(){
Hidden = true;
DOM.hide(TerminalId);
DOM.showPanel();
KeyBinding.set();
Term.pause();
};
/**
* function bind keys
*/
CloudCmd.Terminal.init = function(){
/* loading js and css*/
Util.loadOnLoad([
JqueryTerminal.show,
load,
DOM.socketLoad,
DOM.jqueryLoad,
]);
/* добавляем обработчик клавишь */
var lKeyHandler = function(pEvent){
var lRet = true,
lKEY = CloudCmd.KEY,
lKeyCode = pEvent.keyCode,
lKeyBinded = KeyBinding.get();
/* если клавиши можно обрабатывать */
if(Hidden && lKeyBinded && lKeyCode === lKEY.TRA){
JqueryTerminal.show();
DOM.preventDefault(pEvent);
lRet = false;
}
else if(!Hidden && lKeyCode === lKEY.ESC)
JqueryTerminal.hide();
return lRet;
};
DOM.addKeyListener(lKeyHandler);
};
CloudCmd.Terminal.JqueryTerminal = JqueryTerminal;
})(CloudCommander, Util, DOM);