* Changed the way of work with listeners (DOM.addListener to DOM.Events.add)

This commit is contained in:
coderaiser 2013-05-21 08:40:22 -04:00
parent ad05877173
commit c7e13af2db
9 changed files with 51 additions and 49 deletions

View file

@ -19,6 +19,8 @@ dispatch
* Fixed same background declartion a couple times.
* Changed the way of work with listeners (DOM.addListener to DOM.Events.add).
2012.04.22, v0.2.0

View file

@ -2,7 +2,7 @@
"api_url" : "/api/v1",
"appcache" : false,
"minification" : {
"js" : true,
"js" : false,
"css" : true,
"html" : true,
"img" : true

View file

@ -7,7 +7,7 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCmd;
(function(Util, DOM){
'use strict';
var Config, Modules, FileTemplate, PathTemplate;
var Config, Modules, FileTemplate, PathTemplate, Events = DOM.Events;
/* Клиентский обьект, содержащий функциональную часть*/
CloudCmd = {
@ -59,7 +59,7 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCmd;
};
CloudCmd.GoogleAnalytics = function(){
DOM.addOneTimeListener('mousemove', function(){
Events.addOneTime('mousemove', function(){
var lUrl = CloudCmd.LIBDIRCLIENT + 'google_analytics.js';
setTimeout(function(){
@ -117,7 +117,7 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCmd;
* if user clicks somewhere keyBinded
* backs
*/
DOM.addOneTimeListener('click', function(){
DOM.Events.addOneTime('click', function(){
//lA.contentEditable = false;
//KeyBinding && KeyBinding.set();
});
@ -225,7 +225,7 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCmd;
CloudCmd.getModules(function(pModules){
pModules = pModules || [];
DOM.addContextMenuListener(function(pEvent){
Events.addContextMenu(function(pEvent){
CloudCmd.Menu.ENABLED || DOM.preventDefault(pEvent);
}, document);
@ -287,9 +287,9 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCmd;
var lButton = 'f' + i,
lEl = DOM.getById('f' + i);
if( i === 3 || i === 4)
DOM.addOneTimeListener('click', lFuncs[i], lEl);
Events.addOneTime('click', lFuncs[i], lEl);
else
DOM.addClickListener(lFuncs[i], lEl);
Events.addClick(lFuncs[i], lEl);
lKeysPanel[lButton] = lEl;
}
@ -311,7 +311,7 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCmd;
/* загружаем общие функции для клиента и сервера */
DOM.jsload(CloudCmd.LIBDIR + 'cloudfunc.js', function(){
DOM.addListener("popstate", function(pEvent) {
Events.add("popstate", function(pEvent) {
var lPath = pEvent.state + '?json';
if(lPath)
@ -414,7 +414,7 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCmd;
CloudCmd._changeLinks = function(pPanelID){
/* назначаем кнопку очистить кэш и показываем её */
var lClearcache = DOM.getById('clear-cache');
DOM.addClickListener(DOM.Cache.clear, lClearcache);
Events.addClick(DOM.Cache.clear, lClearcache);
/* меняем ссылки на ajax-запросы */
var lPanel = DOM.getById(pPanelID),
@ -495,7 +495,7 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCmd;
};
/* ставим загрузку гифа на клик*/
DOM.addClickListener( CloudCmd.refresh, a[0].parentElement );
Events.addClick( CloudCmd.refresh, a[0].parentElement );
/* start from 1 cous 0 is a path and it's setted up */
for(var i = 1, n = a.length; i < n ; i++){
@ -509,20 +509,20 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCmd;
/* if we in path - set click event */
if (lLi.className === 'path')
DOM.addClickListener( lLoadDir, ai );
Events.addClick( lLoadDir, ai );
else {
DOM.addClickListener( DOM.preventDefault, lLi);
DOM.addListener('mousedown', lSetCurrentFile_f, lLi);
DOM.addListener('dragstart', lOnDragStart_f, ai);
Events.addClick( DOM.preventDefault, lLi);
Events.add('mousedown', lSetCurrentFile_f, lLi);
Events.add('dragstart', lOnDragStart_f, ai);
/* if right button clicked menu will
* loads and shows
*/
DOM.addListener('contextmenu', lOnContextMenu_f, lLi);
Events.add('contextmenu', lOnContextMenu_f, lLi);
/* если ссылка на папку, а не файл */
if(ai.target !== '_blank'){
DOM.addListener('dblclick', lLoadDirOnce, lLi);
DOM.addListener('touchend', lLoadDirOnce, lLi);
Events.add('dblclick', lLoadDirOnce, lLi);
Events.add('touchend', lLoadDirOnce, lLi);
}
lLi.id = (ai.title ? ai.title : ai.textContent) +
@ -706,7 +706,7 @@ var Util, DOM, CloudFunc, $, KeyBinding, CloudCmd;
return Util.stringifyJSON(lFileTable);
};
DOM.addOneTimeListener('load', function(){
Events.addOneTime('load', function(){
/* базовая инициализация*/
CloudCmd.init();

View file

@ -273,7 +273,7 @@ var CloudCmd, Util, DOM, CloudFunc;
* @param pUseCapture
* @param pElement {document by default}
*/
this.addListener = function(pType, pListener, pElement, pUseCapture){
this.add = function(pType, pListener, pElement, pUseCapture){
var lRet = this,
lElement = (pElement || window);
@ -295,14 +295,14 @@ var CloudCmd, Util, DOM, CloudFunc;
* @param pUseCapture
* @param pElement {document by default}
*/
this.addOneTimeListener = function(pType, pListener, pElement, pUseCapture){
this.addOneTime = function(pType, pListener, pElement, pUseCapture){
var lRet = this,
lOneTime = function (pEvent){
lRet.removeListener(pType, lOneTime, pElement, pUseCapture);
lRet.remove(pType, lOneTime, pElement, pUseCapture);
pListener(pEvent);
};
this.addListener(pType, lOneTime, pElement, pUseCapture);
this.add(pType, lOneTime, pElement, pUseCapture);
return lRet;
};
@ -315,7 +315,7 @@ var CloudCmd, Util, DOM, CloudFunc;
* @param pUseCapture
* @param pElement {document by default}
*/
this.removeListener = function(pType, pListener, pElement, pUseCapture){
this.remove = function(pType, pListener, pElement, pUseCapture){
var lRet = this;
(pElement || window).removeEventListener(
@ -334,8 +334,8 @@ var CloudCmd, Util, DOM, CloudFunc;
* @param pListener
* @param pUseCapture
*/
this.addKeyListener = function(pListener, pElement, pUseCapture){
return this.addListener('keydown', pListener, pElement, pUseCapture);
this.addKey = function(pListener, pElement, pUseCapture){
return this.add('keydown', pListener, pElement, pUseCapture);
};
/**
@ -344,12 +344,12 @@ var CloudCmd, Util, DOM, CloudFunc;
* @param pListener
* @param pUseCapture
*/
this.addClickListener = function(pListener, pElement, pUseCapture){
return this.addListener('click', pListener, pElement, pUseCapture);
this.addClick = function(pListener, pElement, pUseCapture){
return this.add('click', pListener, pElement, pUseCapture);
};
this.addContextMenuListener = function(pListener, pElement, pUseCapture){
return this.addListener('contextmenu', pListener, pElement, pUseCapture);
this.addContextMenu = function(pListener, pElement, pUseCapture){
return this.add('contextmenu', pListener, pElement, pUseCapture);
};
/**
@ -358,8 +358,8 @@ var CloudCmd, Util, DOM, CloudFunc;
* @param pListener
* @param pUseCapture
*/
this.addErrorListener = function(pListener, pElement, pUseCapture){
return this.addListener('error', pListener, pElement, pUseCapture);
this.addError = function(pListener, pElement, pUseCapture){
return this.add('error', pListener, pElement, pUseCapture);
};
/**
@ -368,7 +368,7 @@ var CloudCmd, Util, DOM, CloudFunc;
* @param pEventName
* @param pKeyCode - not necessarily
*/
this.createEvent = function(pEventName, pKeyCode){
this.create = function(pEventName, pKeyCode){
var lEvent = document.createEvent('Event');
lEvent.initEvent(pEventName, true, true);
@ -389,7 +389,7 @@ var CloudCmd, Util, DOM, CloudFunc;
*
* @param pKeyCode
*/
this.createKeyEvent = function(pKeyCode){
this.createKey = function(pKeyCode){
return this.createEvent('keydown', pKeyCode);
};
@ -398,7 +398,7 @@ var CloudCmd, Util, DOM, CloudFunc;
*
* @param pKeyCode
*/
this.createClickEvent = function(){
this.createClick = function(){
return this.createEvent('click');
};
@ -407,7 +407,7 @@ var CloudCmd, Util, DOM, CloudFunc;
*
* @param pKeyCode
*/
this.createDblClickEvent = function(){
this.createDblClick = function(){
return this.createEvent('dblclick');
};
@ -416,7 +416,7 @@ var CloudCmd, Util, DOM, CloudFunc;
*
* @param pEvent
*/
this.dispatch = function(pEvent, pElement){
this.dispatch = function(pEvent, pElement){
return (pElement || window).dispatchEvent(pEvent);
};
@ -426,7 +426,7 @@ var CloudCmd, Util, DOM, CloudFunc;
* @param pKeyCode
* @param pElement
*/
this.dispatchKeyEvent = function(pKeyCode, pElement){
this.dispatchKey = function(pKeyCode, pElement){
var lEvent = this.createKeyEvent(pKeyCode),
lRet = this.dispatch(lEvent, pElement);
@ -438,7 +438,7 @@ var CloudCmd, Util, DOM, CloudFunc;
*
* @param pElement
*/
this.dispatchClickEvent = function(pElement){
this.dispatchClick = function(pElement){
var lEvent = this.createClickEvent(),
lRet = this.dispatch(lEvent, pElement);
@ -450,7 +450,7 @@ var CloudCmd, Util, DOM, CloudFunc;
*
* @param pElement
*/
this.dispatchDblClickEvent = function(pElement){
this.dispatchDblClick = function(pElement){
var lEvent = this.createDblClickEvent(),
lRet = this.dispatch(lEvent, pElement);
@ -781,8 +781,8 @@ var CloudCmd, Util, DOM, CloudFunc;
*/
var lLoad = function(pEvent){
Events.removeListener('load', lLoad, lElement);
Events.removeListener('error', lError, lElement);
Events.remove('load', lLoad, lElement);
Events.remove('error', lError, lElement);
Util.exec(lFunc, pEvent);
},
@ -800,8 +800,8 @@ var CloudCmd, Util, DOM, CloudFunc;
Util.exec(lOnError);
};
Events.addListener('load', lLoad, lElement);
Events.addErrorListener(lError, lElement);
Events.add('load', lLoad, lElement);
Events.addError(lError, lElement);
if(lStyle)
lElement.style.cssText = lStyle;
@ -1804,8 +1804,8 @@ var CloudCmd, Util, DOM, CloudFunc;
Util.extend(DOMProto, [
DOMTree,
Events,
Loader, {
Events : Events,
RESTfull: RESTfull,
Images : Images,
Cache : Cache

View file

@ -5,7 +5,7 @@ var DOM, _gaq;
/* setting google analitics tracking code */
_gaq = [['_setAccount', 'UA-33536569-2'], ['_trackPageview']];
DOM.addErrorListener(function(msg, url, line) {
DOM.Events.addError(function(msg, url, line) {
_gaq.push(['_trackEvent', 'JS Error', msg,
navigator.userAgent + ' -> ' + url + " : " + line]);
});

View file

@ -345,7 +345,7 @@ var CloudCmd, Util, DOM;
};
/* добавляем обработчик клавишь */
DOM.addKeyListener(key_event);
DOM.Events.addKey(key_event);
/* клавиши назначены*/
Binded = true;

View file

@ -308,7 +308,7 @@ var CloudCmd, Util, DOM, CloudFunc, $;
};
/* добавляем обработчик клавишь */
DOM.addKeyListener( key_event );
DOM.Events.addKey( key_event );
};
CloudCmd.Menu = Menu;

View file

@ -128,7 +128,7 @@ var CloudCmd, Util, DOM, $;
return lRet;
};
DOM.addKeyListener(lKeyHandler);
DOM.Events.addKey(lKeyHandler);
};
CloudCmd.Terminal.JqueryTerminal = JqueryTerminal;

View file

@ -153,7 +153,7 @@ var CloudCmd, Util, DOM, CloudFunc, $;
};
/* добавляем обработчик клавишь */
DOM .addKeyListener(lKeyListener)
DOM .Events.addKey(lKeyListener)
.setButtonKey('f3', lView);
};