From 962948caa8d60bb7cdde2edd58f3288a5aa5555a Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 3 Jun 2013 10:53:51 -0400 Subject: [PATCH] simpified plugins id's --- ChangeLog | 2 + lib/client.js | 7 ++- lib/client/{editor => edit}/_ace.js | 0 lib/client/{editor => edit}/_codemirror.js | 50 +++++++----------- lib/client/{editor => edit}/ace/ChangeLog.txt | 0 lib/client/{editor => edit}/ace/LICENSE | 0 lib/client/{editor => edit}/ace/README.md | 0 lib/client/{editor => edit}/ace/ace.js | 0 .../{editor => edit}/ace/mode-coffee.js | 0 .../{editor => edit}/ace/mode-javascript.js | 0 lib/client/{editor => edit}/ace/mode-json.js | 0 .../{editor => edit}/ace/theme-monokai.js | 0 .../ace/theme-tomorrow_night_blue.js | 0 .../{editor => edit}/ace/worker-coffee.js | 0 .../{editor => edit}/ace/worker-javascript.js | 0 .../{editor => edit}/ace/worker-json.js | 0 .../{editor => edit}/codemirror/LICENSE | 0 .../{editor => edit}/codemirror/README.md | 0 .../codemirror/codemirror.css | 0 .../{editor => edit}/codemirror/codemirror.js | 0 .../codemirror/mode/javascript.js | 0 .../{editor => edit}/codemirror/mode/xml.js | 0 .../{editor => edit}/codemirror/package.json | 0 .../codemirror/theme/night.css | 0 .../{editor => edit}/codemirror3/LICENSE | 0 .../{editor => edit}/codemirror3/README.md | 0 .../codemirror3/codemirror.css | 0 .../codemirror3/codemirror.js | 0 .../codemirror3/mode/javascript.js | 0 .../{editor => edit}/codemirror3/mode/xml.js | 0 .../{editor => edit}/codemirror3/package.json | 0 .../codemirror3/theme/night.css | 0 lib/client/terminal.js | 18 +++---- lib/client/{viewer.js => view.js} | 10 ++-- .../{viewer => view}/fancyBox/.gitattributes | 0 .../{viewer => view}/fancyBox/CHANGELOG.md | 0 .../{viewer => view}/fancyBox/README.md | 0 .../{viewer => view}/fancyBox/demo/1_b.jpg | Bin .../{viewer => view}/fancyBox/demo/1_s.jpg | Bin .../{viewer => view}/fancyBox/demo/2_b.jpg | Bin .../{viewer => view}/fancyBox/demo/2_s.jpg | Bin .../{viewer => view}/fancyBox/demo/3_b.jpg | Bin .../{viewer => view}/fancyBox/demo/3_s.jpg | Bin .../{viewer => view}/fancyBox/demo/4_b.jpg | Bin .../{viewer => view}/fancyBox/demo/4_s.jpg | Bin .../{viewer => view}/fancyBox/demo/5_b.jpg | Bin .../{viewer => view}/fancyBox/demo/5_s.jpg | Bin .../{viewer => view}/fancyBox/demo/ajax.txt | 0 .../fancyBox/demo/iframe.html | 0 .../{viewer => view}/fancyBox/demo/index.html | 0 .../fancyBox/lib/jquery-1.9.0.min.js | 0 .../lib/jquery.mousewheel-3.0.6.pack.js | 0 .../fancyBox/source/blank.gif | Bin .../fancyBox/source/fancybox_loading.gif | Bin .../fancyBox/source/fancybox_overlay.png | Bin .../fancyBox/source/fancybox_sprite.png | Bin .../source/helpers/fancybox_buttons.png | Bin .../helpers/jquery.fancybox-buttons.css | 0 .../source/helpers/jquery.fancybox-buttons.js | 0 .../source/helpers/jquery.fancybox-media.js | 0 .../source/helpers/jquery.fancybox-thumbs.css | 0 .../source/helpers/jquery.fancybox-thumbs.js | 0 .../fancyBox/source/jquery.fancybox.css | 0 .../fancyBox/source/jquery.fancybox.js | 0 .../fancyBox/source/jquery.fancybox.pack.js | 0 65 files changed, 36 insertions(+), 51 deletions(-) rename lib/client/{editor => edit}/_ace.js (100%) rename lib/client/{editor => edit}/_codemirror.js (80%) rename lib/client/{editor => edit}/ace/ChangeLog.txt (100%) rename lib/client/{editor => edit}/ace/LICENSE (100%) rename lib/client/{editor => edit}/ace/README.md (100%) rename lib/client/{editor => edit}/ace/ace.js (100%) rename lib/client/{editor => edit}/ace/mode-coffee.js (100%) rename lib/client/{editor => edit}/ace/mode-javascript.js (100%) rename lib/client/{editor => edit}/ace/mode-json.js (100%) rename lib/client/{editor => edit}/ace/theme-monokai.js (100%) rename lib/client/{editor => edit}/ace/theme-tomorrow_night_blue.js (100%) rename lib/client/{editor => edit}/ace/worker-coffee.js (100%) rename lib/client/{editor => edit}/ace/worker-javascript.js (100%) rename lib/client/{editor => edit}/ace/worker-json.js (100%) rename lib/client/{editor => edit}/codemirror/LICENSE (100%) rename lib/client/{editor => edit}/codemirror/README.md (100%) rename lib/client/{editor => edit}/codemirror/codemirror.css (100%) rename lib/client/{editor => edit}/codemirror/codemirror.js (100%) rename lib/client/{editor => edit}/codemirror/mode/javascript.js (100%) rename lib/client/{editor => edit}/codemirror/mode/xml.js (100%) rename lib/client/{editor => edit}/codemirror/package.json (100%) rename lib/client/{editor => edit}/codemirror/theme/night.css (100%) rename lib/client/{editor => edit}/codemirror3/LICENSE (100%) rename lib/client/{editor => edit}/codemirror3/README.md (100%) rename lib/client/{editor => edit}/codemirror3/codemirror.css (100%) rename lib/client/{editor => edit}/codemirror3/codemirror.js (100%) rename lib/client/{editor => edit}/codemirror3/mode/javascript.js (100%) rename lib/client/{editor => edit}/codemirror3/mode/xml.js (100%) rename lib/client/{editor => edit}/codemirror3/package.json (100%) rename lib/client/{editor => edit}/codemirror3/theme/night.css (100%) rename lib/client/{viewer.js => view.js} (94%) rename lib/client/{viewer => view}/fancyBox/.gitattributes (100%) rename lib/client/{viewer => view}/fancyBox/CHANGELOG.md (100%) rename lib/client/{viewer => view}/fancyBox/README.md (100%) rename lib/client/{viewer => view}/fancyBox/demo/1_b.jpg (100%) rename lib/client/{viewer => view}/fancyBox/demo/1_s.jpg (100%) rename lib/client/{viewer => view}/fancyBox/demo/2_b.jpg (100%) rename lib/client/{viewer => view}/fancyBox/demo/2_s.jpg (100%) rename lib/client/{viewer => view}/fancyBox/demo/3_b.jpg (100%) rename lib/client/{viewer => view}/fancyBox/demo/3_s.jpg (100%) rename lib/client/{viewer => view}/fancyBox/demo/4_b.jpg (100%) rename lib/client/{viewer => view}/fancyBox/demo/4_s.jpg (100%) rename lib/client/{viewer => view}/fancyBox/demo/5_b.jpg (100%) rename lib/client/{viewer => view}/fancyBox/demo/5_s.jpg (100%) rename lib/client/{viewer => view}/fancyBox/demo/ajax.txt (100%) rename lib/client/{viewer => view}/fancyBox/demo/iframe.html (100%) rename lib/client/{viewer => view}/fancyBox/demo/index.html (100%) rename lib/client/{viewer => view}/fancyBox/lib/jquery-1.9.0.min.js (100%) rename lib/client/{viewer => view}/fancyBox/lib/jquery.mousewheel-3.0.6.pack.js (100%) rename lib/client/{viewer => view}/fancyBox/source/blank.gif (100%) rename lib/client/{viewer => view}/fancyBox/source/fancybox_loading.gif (100%) rename lib/client/{viewer => view}/fancyBox/source/fancybox_overlay.png (100%) rename lib/client/{viewer => view}/fancyBox/source/fancybox_sprite.png (100%) rename lib/client/{viewer => view}/fancyBox/source/helpers/fancybox_buttons.png (100%) rename lib/client/{viewer => view}/fancyBox/source/helpers/jquery.fancybox-buttons.css (100%) rename lib/client/{viewer => view}/fancyBox/source/helpers/jquery.fancybox-buttons.js (100%) rename lib/client/{viewer => view}/fancyBox/source/helpers/jquery.fancybox-media.js (100%) rename lib/client/{viewer => view}/fancyBox/source/helpers/jquery.fancybox-thumbs.css (100%) rename lib/client/{viewer => view}/fancyBox/source/helpers/jquery.fancybox-thumbs.js (100%) rename lib/client/{viewer => view}/fancyBox/source/jquery.fancybox.css (100%) rename lib/client/{viewer => view}/fancyBox/source/jquery.fancybox.js (100%) rename lib/client/{viewer => view}/fancyBox/source/jquery.fancybox.pack.js (100%) diff --git a/ChangeLog b/ChangeLog index b758edec..96b4eae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,8 @@ getJSONfromFileTable. * Moved CloudCmd.KEY object data to prototype of CloudCmd.Key. +* Simpified plugins id's. + 2012.04.22, v0.2.0 diff --git a/lib/client.js b/lib/client.js index 13b85ed9..8b65feb5 100644 --- a/lib/client.js +++ b/lib/client.js @@ -92,7 +92,7 @@ var Util, DOM, CloudFunc, CloudCmd; DOM.setCurrentFile(lRootDir); DOM.scrollIntoViewIfNeeded(lRootDir, true); } - }; + } /** * function load modules @@ -133,6 +133,7 @@ var Util, DOM, CloudFunc, CloudCmd; }; } } + /** Конструктор CloudClient, который * выполняет весь функционал по * инициализации @@ -153,8 +154,6 @@ var Util, DOM, CloudFunc, CloudCmd; DOM.retJSLoad(lSrc, pCallBack) ); }; - - //Util.socketLoad(); Util.ifExec(document.body.scrollIntoViewIfNeeded, lCallBack, lFunc); }; @@ -181,7 +180,7 @@ var Util, DOM, CloudFunc, CloudCmd; lDoBefore = { 'editor/_codemirror' : lShowLoadFunc, - 'viewer' : lShowLoadFunc + 'view' : lShowLoadFunc }, lLoad = function(pName, pPath, pDoBefore){ diff --git a/lib/client/editor/_ace.js b/lib/client/edit/_ace.js similarity index 100% rename from lib/client/editor/_ace.js rename to lib/client/edit/_ace.js diff --git a/lib/client/editor/_codemirror.js b/lib/client/edit/_codemirror.js similarity index 80% rename from lib/client/editor/_codemirror.js rename to lib/client/edit/_codemirror.js index d5bf2f3a..53c9afab 100644 --- a/lib/client/editor/_codemirror.js +++ b/lib/client/edit/_codemirror.js @@ -3,14 +3,13 @@ var CloudCmd, Util, DOM, CodeMirror; (function(CloudCmd, Util, DOM){ 'use strict'; - var Key = CloudCmd.Key, - CodeMirrorEditor = {}, + var Key = CloudCmd.Key, + Editor = {}, FM, - CodeMirrorElement, - CodeMirrorLoaded = false, - /* indicator says CodeMirror still loads */ - Loading = false, - ReadOnly = false, + Element, + CodeMirrorLoaded = false, + Loading = false, + ReadOnly = false, CallBacks = [ hide, @@ -19,18 +18,10 @@ var CloudCmd, Util, DOM, CodeMirror; load ]; - CloudCmd.Editor = { - get : (function(){ - return this.CodeMirror; - }) - }; - - /* private functions */ - function setCSS(){ var lPosition = DOM.getPanel().id, lRet = DOM.cssSet({ - id : 'editor', + id : 'editor-css', inner : '.CodeMirror{' + 'font-family' + ': \'Droid Sans Mono\';' + 'font-size' + ': 15px;' + @@ -38,7 +29,7 @@ var CloudCmd, Util, DOM, CodeMirror; '.CodeMirror-scroll{' + 'height' + ':' + CloudCmd.HEIGHT + 'px' + '}' + - '#CodeMirrorEditor{' + + '#editor{' + 'float' + ':' + lPosition + '}' }); @@ -58,19 +49,18 @@ var CloudCmd, Util, DOM, CodeMirror; lCurrent = DOM.getCurrentFile(), lPath = DOM.getCurrentPath( lCurrent ); - CodeMirrorElement = DOM.anyload({ + Element = DOM.anyload({ name : 'div', - id : 'CodeMirrorEditor', + id : 'editor', className : 'panel', parent : FM }); - var lEditor = CodeMirrorEditor.CodeMirror = new CodeMirror(CodeMirrorElement,{ + var lEditor = Editor.CodeMirror = new CodeMirror(Element, { mode : 'javascript', value : pParams && pParams.data && pParams.data.data, theme : 'night', lineNumbers : true, - //переносим длинные строки lineWrapping: false, autofocus : true, extraKeys: { @@ -157,8 +147,8 @@ var CloudCmd, Util, DOM, CodeMirror; function hide() { Key.setBind(); - if(CodeMirrorElement && FM) - FM.removeChild(CodeMirrorElement); + if(Element && FM) + FM.removeChild(Element); DOM.showPanel(); } @@ -166,7 +156,7 @@ var CloudCmd, Util, DOM, CodeMirror; /** * function calls all CodeMirror editor functions */ - CodeMirrorEditor.show = function(){ + Editor.show = function(){ DOM.Images.showLoad(); Util.loadOnLoad( CallBacks ); }; @@ -174,18 +164,18 @@ var CloudCmd, Util, DOM, CodeMirror; /** * function hides CodeMirror editor */ - CodeMirrorEditor.hide = hide; + Editor.hide = hide; /** * function bind keys */ CloudCmd.Editor.init = function(){ - CodeMirrorEditor.show(); + Editor.show(); CallBacks.pop(); /* добавляем обработчик клавишь */ - DOM.Events.addKey( lListener ); - DOM.setButtonKey('f4', CodeMirrorEditor.show); + DOM.Events.addKey(lListener); + DOM.setButtonKey('f4', Editor.show); function lListener(pEvent){ var lIsBind = Key.isBind(); @@ -195,11 +185,11 @@ var CloudCmd, Util, DOM, CodeMirror; lKey = pEvent.keyCode; if(lKey === lF4) - CodeMirrorEditor.show(); + Editor.show(); } } }; - CloudCmd.Editor.CodeMirror = CodeMirrorEditor; + CloudCmd.Editor.CodeMirror = Editor; })(CloudCmd, Util, DOM); diff --git a/lib/client/editor/ace/ChangeLog.txt b/lib/client/edit/ace/ChangeLog.txt similarity index 100% rename from lib/client/editor/ace/ChangeLog.txt rename to lib/client/edit/ace/ChangeLog.txt diff --git a/lib/client/editor/ace/LICENSE b/lib/client/edit/ace/LICENSE similarity index 100% rename from lib/client/editor/ace/LICENSE rename to lib/client/edit/ace/LICENSE diff --git a/lib/client/editor/ace/README.md b/lib/client/edit/ace/README.md similarity index 100% rename from lib/client/editor/ace/README.md rename to lib/client/edit/ace/README.md diff --git a/lib/client/editor/ace/ace.js b/lib/client/edit/ace/ace.js similarity index 100% rename from lib/client/editor/ace/ace.js rename to lib/client/edit/ace/ace.js diff --git a/lib/client/editor/ace/mode-coffee.js b/lib/client/edit/ace/mode-coffee.js similarity index 100% rename from lib/client/editor/ace/mode-coffee.js rename to lib/client/edit/ace/mode-coffee.js diff --git a/lib/client/editor/ace/mode-javascript.js b/lib/client/edit/ace/mode-javascript.js similarity index 100% rename from lib/client/editor/ace/mode-javascript.js rename to lib/client/edit/ace/mode-javascript.js diff --git a/lib/client/editor/ace/mode-json.js b/lib/client/edit/ace/mode-json.js similarity index 100% rename from lib/client/editor/ace/mode-json.js rename to lib/client/edit/ace/mode-json.js diff --git a/lib/client/editor/ace/theme-monokai.js b/lib/client/edit/ace/theme-monokai.js similarity index 100% rename from lib/client/editor/ace/theme-monokai.js rename to lib/client/edit/ace/theme-monokai.js diff --git a/lib/client/editor/ace/theme-tomorrow_night_blue.js b/lib/client/edit/ace/theme-tomorrow_night_blue.js similarity index 100% rename from lib/client/editor/ace/theme-tomorrow_night_blue.js rename to lib/client/edit/ace/theme-tomorrow_night_blue.js diff --git a/lib/client/editor/ace/worker-coffee.js b/lib/client/edit/ace/worker-coffee.js similarity index 100% rename from lib/client/editor/ace/worker-coffee.js rename to lib/client/edit/ace/worker-coffee.js diff --git a/lib/client/editor/ace/worker-javascript.js b/lib/client/edit/ace/worker-javascript.js similarity index 100% rename from lib/client/editor/ace/worker-javascript.js rename to lib/client/edit/ace/worker-javascript.js diff --git a/lib/client/editor/ace/worker-json.js b/lib/client/edit/ace/worker-json.js similarity index 100% rename from lib/client/editor/ace/worker-json.js rename to lib/client/edit/ace/worker-json.js diff --git a/lib/client/editor/codemirror/LICENSE b/lib/client/edit/codemirror/LICENSE similarity index 100% rename from lib/client/editor/codemirror/LICENSE rename to lib/client/edit/codemirror/LICENSE diff --git a/lib/client/editor/codemirror/README.md b/lib/client/edit/codemirror/README.md similarity index 100% rename from lib/client/editor/codemirror/README.md rename to lib/client/edit/codemirror/README.md diff --git a/lib/client/editor/codemirror/codemirror.css b/lib/client/edit/codemirror/codemirror.css similarity index 100% rename from lib/client/editor/codemirror/codemirror.css rename to lib/client/edit/codemirror/codemirror.css diff --git a/lib/client/editor/codemirror/codemirror.js b/lib/client/edit/codemirror/codemirror.js similarity index 100% rename from lib/client/editor/codemirror/codemirror.js rename to lib/client/edit/codemirror/codemirror.js diff --git a/lib/client/editor/codemirror/mode/javascript.js b/lib/client/edit/codemirror/mode/javascript.js similarity index 100% rename from lib/client/editor/codemirror/mode/javascript.js rename to lib/client/edit/codemirror/mode/javascript.js diff --git a/lib/client/editor/codemirror/mode/xml.js b/lib/client/edit/codemirror/mode/xml.js similarity index 100% rename from lib/client/editor/codemirror/mode/xml.js rename to lib/client/edit/codemirror/mode/xml.js diff --git a/lib/client/editor/codemirror/package.json b/lib/client/edit/codemirror/package.json similarity index 100% rename from lib/client/editor/codemirror/package.json rename to lib/client/edit/codemirror/package.json diff --git a/lib/client/editor/codemirror/theme/night.css b/lib/client/edit/codemirror/theme/night.css similarity index 100% rename from lib/client/editor/codemirror/theme/night.css rename to lib/client/edit/codemirror/theme/night.css diff --git a/lib/client/editor/codemirror3/LICENSE b/lib/client/edit/codemirror3/LICENSE similarity index 100% rename from lib/client/editor/codemirror3/LICENSE rename to lib/client/edit/codemirror3/LICENSE diff --git a/lib/client/editor/codemirror3/README.md b/lib/client/edit/codemirror3/README.md similarity index 100% rename from lib/client/editor/codemirror3/README.md rename to lib/client/edit/codemirror3/README.md diff --git a/lib/client/editor/codemirror3/codemirror.css b/lib/client/edit/codemirror3/codemirror.css similarity index 100% rename from lib/client/editor/codemirror3/codemirror.css rename to lib/client/edit/codemirror3/codemirror.css diff --git a/lib/client/editor/codemirror3/codemirror.js b/lib/client/edit/codemirror3/codemirror.js similarity index 100% rename from lib/client/editor/codemirror3/codemirror.js rename to lib/client/edit/codemirror3/codemirror.js diff --git a/lib/client/editor/codemirror3/mode/javascript.js b/lib/client/edit/codemirror3/mode/javascript.js similarity index 100% rename from lib/client/editor/codemirror3/mode/javascript.js rename to lib/client/edit/codemirror3/mode/javascript.js diff --git a/lib/client/editor/codemirror3/mode/xml.js b/lib/client/edit/codemirror3/mode/xml.js similarity index 100% rename from lib/client/editor/codemirror3/mode/xml.js rename to lib/client/edit/codemirror3/mode/xml.js diff --git a/lib/client/editor/codemirror3/package.json b/lib/client/edit/codemirror3/package.json similarity index 100% rename from lib/client/editor/codemirror3/package.json rename to lib/client/edit/codemirror3/package.json diff --git a/lib/client/editor/codemirror3/theme/night.css b/lib/client/edit/codemirror3/theme/night.css similarity index 100% rename from lib/client/editor/codemirror3/theme/night.css rename to lib/client/edit/codemirror3/theme/night.css diff --git a/lib/client/terminal.js b/lib/client/terminal.js index cd2ccf96..c311d20e 100644 --- a/lib/client/terminal.js +++ b/lib/client/terminal.js @@ -11,8 +11,6 @@ var CloudCmd, Util, DOM, $; JqueryTerminal = {}; CloudCmd.Terminal = {}; - - /* PRIVATE FUNCTIONS */ /** * function loads jquery-terminal @@ -32,24 +30,22 @@ var CloudCmd, Util, DOM, $; DOM.anyLoadOnLoad([lFiles, lJqueryMigrate], function(){ Util.timeEnd('terminal load'); init(); - $(function($, undefined) { + $(function($) { Term = JqueryTerminal.Term = $('#terminal').terminal(function(command, term){ term.echo(''); CloudCmd.Socket.send(command); }, { - greetings : '[[;#729FCF;]Cloud Commander Terminal]', + greetings : '[[;#729FCF;]CloudCmd 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{' + + }).cssSet({id:'terminal-css', + inner: '.terminal{' + 'height: 720px;' + '};' }); @@ -63,13 +59,11 @@ var CloudCmd, Util, DOM, $; TerminalId = DOM.anyload({ name : 'div', id : 'terminal', - className : 'panel cloudTerminal', + className : 'panel terminal', parent : DOM.getFM() }); } - /* PUBLIC FUNCTIONS */ - /** * functin show jquery-terminal */ @@ -108,7 +102,7 @@ var CloudCmd, Util, DOM, $; DOM.jqueryLoad, ]); - DOM.Events.addKey( lListener ); + DOM.Events.addKey(lListener); function lListener(pEvent){ var lRet = true, diff --git a/lib/client/viewer.js b/lib/client/view.js similarity index 94% rename from lib/client/viewer.js rename to lib/client/view.js index 416d7990..fd1aa546 100644 --- a/lib/client/viewer.js +++ b/lib/client/view.js @@ -15,7 +15,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; }, afterShow : function(){ - var lEditor = DOM.getById('CloudViewer'); + var lEditor = DOM.getById('View'); if(lEditor) lEditor.focus(); }, @@ -57,12 +57,12 @@ var CloudCmd, Util, DOM, CloudFunc, $; Util.timeEnd('fancybox load'); Util.exec( pCallBack ); }) - .cssSet({id:'viewer', - inner : '#CloudViewer{' + + .cssSet({id:'view-css', + inner : '#view{' + 'font-size: 16px;' + 'white-space :pre' + '}' + - '#CloudViewer::selection{' + + '#view::selection{' + /* 'background: #fe57a1;' 'color: #fff;' @@ -108,7 +108,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; $.fancybox.open({ href : lPath }, Config); else DOM.getCurrentData(function(pParams){ - $.fancybox('
' + + $.fancybox('
' + pParams.data + '
', Config); }); diff --git a/lib/client/viewer/fancyBox/.gitattributes b/lib/client/view/fancyBox/.gitattributes similarity index 100% rename from lib/client/viewer/fancyBox/.gitattributes rename to lib/client/view/fancyBox/.gitattributes diff --git a/lib/client/viewer/fancyBox/CHANGELOG.md b/lib/client/view/fancyBox/CHANGELOG.md similarity index 100% rename from lib/client/viewer/fancyBox/CHANGELOG.md rename to lib/client/view/fancyBox/CHANGELOG.md diff --git a/lib/client/viewer/fancyBox/README.md b/lib/client/view/fancyBox/README.md similarity index 100% rename from lib/client/viewer/fancyBox/README.md rename to lib/client/view/fancyBox/README.md diff --git a/lib/client/viewer/fancyBox/demo/1_b.jpg b/lib/client/view/fancyBox/demo/1_b.jpg similarity index 100% rename from lib/client/viewer/fancyBox/demo/1_b.jpg rename to lib/client/view/fancyBox/demo/1_b.jpg diff --git a/lib/client/viewer/fancyBox/demo/1_s.jpg b/lib/client/view/fancyBox/demo/1_s.jpg similarity index 100% rename from lib/client/viewer/fancyBox/demo/1_s.jpg rename to lib/client/view/fancyBox/demo/1_s.jpg diff --git a/lib/client/viewer/fancyBox/demo/2_b.jpg b/lib/client/view/fancyBox/demo/2_b.jpg similarity index 100% rename from lib/client/viewer/fancyBox/demo/2_b.jpg rename to lib/client/view/fancyBox/demo/2_b.jpg diff --git a/lib/client/viewer/fancyBox/demo/2_s.jpg b/lib/client/view/fancyBox/demo/2_s.jpg similarity index 100% rename from lib/client/viewer/fancyBox/demo/2_s.jpg rename to lib/client/view/fancyBox/demo/2_s.jpg diff --git a/lib/client/viewer/fancyBox/demo/3_b.jpg b/lib/client/view/fancyBox/demo/3_b.jpg similarity index 100% rename from lib/client/viewer/fancyBox/demo/3_b.jpg rename to lib/client/view/fancyBox/demo/3_b.jpg diff --git a/lib/client/viewer/fancyBox/demo/3_s.jpg b/lib/client/view/fancyBox/demo/3_s.jpg similarity index 100% rename from lib/client/viewer/fancyBox/demo/3_s.jpg rename to lib/client/view/fancyBox/demo/3_s.jpg diff --git a/lib/client/viewer/fancyBox/demo/4_b.jpg b/lib/client/view/fancyBox/demo/4_b.jpg similarity index 100% rename from lib/client/viewer/fancyBox/demo/4_b.jpg rename to lib/client/view/fancyBox/demo/4_b.jpg diff --git a/lib/client/viewer/fancyBox/demo/4_s.jpg b/lib/client/view/fancyBox/demo/4_s.jpg similarity index 100% rename from lib/client/viewer/fancyBox/demo/4_s.jpg rename to lib/client/view/fancyBox/demo/4_s.jpg diff --git a/lib/client/viewer/fancyBox/demo/5_b.jpg b/lib/client/view/fancyBox/demo/5_b.jpg similarity index 100% rename from lib/client/viewer/fancyBox/demo/5_b.jpg rename to lib/client/view/fancyBox/demo/5_b.jpg diff --git a/lib/client/viewer/fancyBox/demo/5_s.jpg b/lib/client/view/fancyBox/demo/5_s.jpg similarity index 100% rename from lib/client/viewer/fancyBox/demo/5_s.jpg rename to lib/client/view/fancyBox/demo/5_s.jpg diff --git a/lib/client/viewer/fancyBox/demo/ajax.txt b/lib/client/view/fancyBox/demo/ajax.txt similarity index 100% rename from lib/client/viewer/fancyBox/demo/ajax.txt rename to lib/client/view/fancyBox/demo/ajax.txt diff --git a/lib/client/viewer/fancyBox/demo/iframe.html b/lib/client/view/fancyBox/demo/iframe.html similarity index 100% rename from lib/client/viewer/fancyBox/demo/iframe.html rename to lib/client/view/fancyBox/demo/iframe.html diff --git a/lib/client/viewer/fancyBox/demo/index.html b/lib/client/view/fancyBox/demo/index.html similarity index 100% rename from lib/client/viewer/fancyBox/demo/index.html rename to lib/client/view/fancyBox/demo/index.html diff --git a/lib/client/viewer/fancyBox/lib/jquery-1.9.0.min.js b/lib/client/view/fancyBox/lib/jquery-1.9.0.min.js similarity index 100% rename from lib/client/viewer/fancyBox/lib/jquery-1.9.0.min.js rename to lib/client/view/fancyBox/lib/jquery-1.9.0.min.js diff --git a/lib/client/viewer/fancyBox/lib/jquery.mousewheel-3.0.6.pack.js b/lib/client/view/fancyBox/lib/jquery.mousewheel-3.0.6.pack.js similarity index 100% rename from lib/client/viewer/fancyBox/lib/jquery.mousewheel-3.0.6.pack.js rename to lib/client/view/fancyBox/lib/jquery.mousewheel-3.0.6.pack.js diff --git a/lib/client/viewer/fancyBox/source/blank.gif b/lib/client/view/fancyBox/source/blank.gif similarity index 100% rename from lib/client/viewer/fancyBox/source/blank.gif rename to lib/client/view/fancyBox/source/blank.gif diff --git a/lib/client/viewer/fancyBox/source/fancybox_loading.gif b/lib/client/view/fancyBox/source/fancybox_loading.gif similarity index 100% rename from lib/client/viewer/fancyBox/source/fancybox_loading.gif rename to lib/client/view/fancyBox/source/fancybox_loading.gif diff --git a/lib/client/viewer/fancyBox/source/fancybox_overlay.png b/lib/client/view/fancyBox/source/fancybox_overlay.png similarity index 100% rename from lib/client/viewer/fancyBox/source/fancybox_overlay.png rename to lib/client/view/fancyBox/source/fancybox_overlay.png diff --git a/lib/client/viewer/fancyBox/source/fancybox_sprite.png b/lib/client/view/fancyBox/source/fancybox_sprite.png similarity index 100% rename from lib/client/viewer/fancyBox/source/fancybox_sprite.png rename to lib/client/view/fancyBox/source/fancybox_sprite.png diff --git a/lib/client/viewer/fancyBox/source/helpers/fancybox_buttons.png b/lib/client/view/fancyBox/source/helpers/fancybox_buttons.png similarity index 100% rename from lib/client/viewer/fancyBox/source/helpers/fancybox_buttons.png rename to lib/client/view/fancyBox/source/helpers/fancybox_buttons.png diff --git a/lib/client/viewer/fancyBox/source/helpers/jquery.fancybox-buttons.css b/lib/client/view/fancyBox/source/helpers/jquery.fancybox-buttons.css similarity index 100% rename from lib/client/viewer/fancyBox/source/helpers/jquery.fancybox-buttons.css rename to lib/client/view/fancyBox/source/helpers/jquery.fancybox-buttons.css diff --git a/lib/client/viewer/fancyBox/source/helpers/jquery.fancybox-buttons.js b/lib/client/view/fancyBox/source/helpers/jquery.fancybox-buttons.js similarity index 100% rename from lib/client/viewer/fancyBox/source/helpers/jquery.fancybox-buttons.js rename to lib/client/view/fancyBox/source/helpers/jquery.fancybox-buttons.js diff --git a/lib/client/viewer/fancyBox/source/helpers/jquery.fancybox-media.js b/lib/client/view/fancyBox/source/helpers/jquery.fancybox-media.js similarity index 100% rename from lib/client/viewer/fancyBox/source/helpers/jquery.fancybox-media.js rename to lib/client/view/fancyBox/source/helpers/jquery.fancybox-media.js diff --git a/lib/client/viewer/fancyBox/source/helpers/jquery.fancybox-thumbs.css b/lib/client/view/fancyBox/source/helpers/jquery.fancybox-thumbs.css similarity index 100% rename from lib/client/viewer/fancyBox/source/helpers/jquery.fancybox-thumbs.css rename to lib/client/view/fancyBox/source/helpers/jquery.fancybox-thumbs.css diff --git a/lib/client/viewer/fancyBox/source/helpers/jquery.fancybox-thumbs.js b/lib/client/view/fancyBox/source/helpers/jquery.fancybox-thumbs.js similarity index 100% rename from lib/client/viewer/fancyBox/source/helpers/jquery.fancybox-thumbs.js rename to lib/client/view/fancyBox/source/helpers/jquery.fancybox-thumbs.js diff --git a/lib/client/viewer/fancyBox/source/jquery.fancybox.css b/lib/client/view/fancyBox/source/jquery.fancybox.css similarity index 100% rename from lib/client/viewer/fancyBox/source/jquery.fancybox.css rename to lib/client/view/fancyBox/source/jquery.fancybox.css diff --git a/lib/client/viewer/fancyBox/source/jquery.fancybox.js b/lib/client/view/fancyBox/source/jquery.fancybox.js similarity index 100% rename from lib/client/viewer/fancyBox/source/jquery.fancybox.js rename to lib/client/view/fancyBox/source/jquery.fancybox.js diff --git a/lib/client/viewer/fancyBox/source/jquery.fancybox.pack.js b/lib/client/view/fancyBox/source/jquery.fancybox.pack.js similarity index 100% rename from lib/client/viewer/fancyBox/source/jquery.fancybox.pack.js rename to lib/client/view/fancyBox/source/jquery.fancybox.pack.js