diff --git a/cloudcmd.js b/cloudcmd.js index 1ad7c4e3..be4384be 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -140,19 +140,24 @@ * routing of server queries */ function route(pParams){ - Util.log('* Routing'); var lRet, lName = pParams.name; if( Util.strCmp(lName, '/auth') ){ - Util.log('-> auth'); + Util.log('* Routing' + + '-> auth'); + pParams.name = main.HTMLDIR + lName + '.html'; main.sendFile(pParams); + lRet = true; }else if( Util.strCmp(lName, '/auth/github') ){ - Util.log('-> github'); + Util.log('* Routing' + + '-> github'); + pParams.name = main.HTMLDIR + lName + '.html'; main.sendFile(pParams); + lRet = true; } diff --git a/lib/client/menu.js b/lib/client/menu.js index b74cb460..abcb815e 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -34,7 +34,7 @@ var CloudCommander, Util, DOM, $; } } - function getContent(pCallBack){ + function getCurrentData(pCallBack){ return DOM.getCurrentFileContent(function(pData){ var lName = DOM.getCurrentName(); if( Util.isObject(pData) ){ @@ -52,7 +52,35 @@ var CloudCommander, Util, DOM, $; }); } - /** function return configureation for menu */ + /** + * function get menu item object for Upload To + */ + function getUploadToItem(pObjectName){ + var lObj = {}; + lObj.name = pObjectName; + + lObj.callback = function(key, opt){ + getCurrentData(function(pParams){ + var lObject = cloudcmd[pObjectName], + lName = pParams.name, + lData = pParams.data; + if('init' in lObject) + lObject.uploadFile(lData, lName); + else + Util.exec(lObject, function(){ + cloudcmd[pObjectName].uploadFile(lData, lName); + }); + }); + + Util.log('Uploading to ' + pObjectName+ '...'); + }; + + return lObj; + } + + /** + * function return configureation for menu + */ function getConfig (){ return{ // define which elements trigger this menu @@ -71,7 +99,7 @@ var CloudCommander, Util, DOM, $; name : 'View', callback : function(key, opt){ showEditor(true); - } + } }, edit: { @@ -85,37 +113,18 @@ var CloudCommander, Util, DOM, $; name: 'Delete', callback: function(key, opt){ DOM.promptRemoveCurrent(); - } + } }, upload: { name: 'Upload to', items: { - 'gist': { - name: 'Gist', - callback: function(key, opt){ - getContent(function(pParams){ - var lGitHub = cloudcmd.GitHub, - lData = pParams.data, - lName = pParams.name; - - if('init' in lGitHub) - lGitHub.createGist(lData, lName); - else - Util.exec(cloudcmd.GitHub, - function(){ - lGitHub.createGist(lData, lName); - }); - }); - - Util.log('Uploading to gist...'); - } - }, + 'GitHub': getUploadToItem('GitHub'), 'gdrive': { name: 'GDrive', callback: function(key, opt){ - getContent(function(pParams){ + getCurrentData(function(pParams){ var lGDrive = cloudcmd.GDrive; if('init' in lGDrive) @@ -127,25 +136,8 @@ var CloudCommander, Util, DOM, $; Util.log('Uploading to gdrive...'); } }, - 'dropbox':{ - name: 'DropBox', - callback: function(key, opt){ - getContent(function(pParams){ - var lDropBox = cloudcmd.DropBox, - lData = pParams.data, - lName = pParams.name; - - if('init' in lDropBox) - lDropBox.uploadFile(lData, lName); - else - Util.exec(lDropBox, function(){ - cloudcmd.DropBox.uploadFile(lData, lName); - }); - }); - - Util.log('Uploading to dropbox...'); - } - } + + 'DropBox': getUploadToItem('DropBox') } }, @@ -277,7 +269,7 @@ var CloudCommander, Util, DOM, $; DOM.Images.hideLoad(); if(Position && Position.x && Position.y) - $('li').contextMenu(Position); + $('li').contextMenu(Position); else $('li').contextMenu(); }; diff --git a/lib/client/storage/_github.js b/lib/client/storage/_github.js index 1892a137..2163dffa 100644 --- a/lib/client/storage/_github.js +++ b/lib/client/storage/_github.js @@ -142,7 +142,7 @@ var CloudCommander, Util, DOM, $, Github, cb; /** * function creates gist */ - cloudcmd.GitHub.createGist = function(pContent, pFileName){ + cloudcmd.GitHub.uploadFile = function(pContent, pFileName){ if(pContent){ DOM.Images.showLoad(); if(!pFileName) diff --git a/package.json b/package.json index f330fae7..df1f8408 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cloudcmd", "version": "0.1.8", "author": "coderaiser (https://github.com/coderaiser)", - "description": "Two-panels file manager, totally writed on js.", + "description": "User friendly cloud file manager.", "homepage": "https://github.com/coderaiser/cloudcmd", "repository": { "type": "git",