From cb3189d4435449a9035d29045830c66a5b52c790 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Mon, 24 Aug 2015 12:35:49 -0400
Subject: [PATCH] feature(cloudcmd) improve prefix support

---
 lib/client/edit.js      |  6 ++++--
 lib/client/konsole.js   | 13 +++++++++++--
 lib/client/operation.js | 13 ++++++++-----
 lib/cloudcmd.js         | 19 ++++++++++++-------
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/lib/client/edit.js b/lib/client/edit.js
index e5ae9fc5..b791cce6 100644
--- a/lib/client/edit.js
+++ b/lib/client/edit.js
@@ -135,13 +135,15 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO, Format, edward;
         }
         
         function loadFiles(element, callback) {
-            var url = '/' + Editor + '/' + Editor + '.js';
+            var prefix  = CloudCmd.PREFIX + '/' + Editor,
+                url     = prefix + '/' + Editor + '.js';
             
             Util.time(Name + ' load');
             
             DOM.load.js(url, function() {
                 var options = {
-                    maxSize : CloudFunc.MAX_FILE_SIZE
+                    maxSize: CloudFunc.MAX_FILE_SIZE,
+                    prefix: prefix
                 };
                 
                 edward = window[Editor];
diff --git a/lib/client/konsole.js b/lib/client/konsole.js
index 0e9f71f0..d0342bc2 100644
--- a/lib/client/konsole.js
+++ b/lib/client/konsole.js
@@ -41,8 +41,14 @@
             Console.clear();
         };
         
+        function getPrefix() {
+            return CloudCmd.PREFIX + '/console';
+        }
+        
         function create(callback) {
-            Console(Element, function() {
+            var prefix = getPrefix();
+            
+            Console(Element, prefix, function() {
                 Util.exec(callback);
             });
             
@@ -68,7 +74,10 @@
         };
         
         function load(callback) {
-            DOM.load.js('/console/console.js', function(error) {
+            var prefix  = getPrefix(),
+                url     = prefix + '/console.js';
+            
+            DOM.load.js(url, function(error) {
                 if (error) {
                     Dialog.alert(error.message);
                 } else {
diff --git a/lib/client/operation.js b/lib/client/operation.js
index 57970938..cd72921e 100644
--- a/lib/client/operation.js
+++ b/lib/client/operation.js
@@ -473,11 +473,14 @@
         }
         
         function load(callback) {
-            var files = [
-                '/spero/spero.js',
-                '/remedy/remedy.js',
-                '/ishtar/ishtar.js'
-            ];
+            var prefix  = CloudCmd.PREFIX,
+                files   = [
+                    '/spero/spero.js',
+                    '/remedy/remedy.js',
+                    '/ishtar/ishtar.js'
+            ].map(function(name) {
+                return prefix + name;
+            });
             
             DOM.load.parallel(files, function(error) {
                 if (error) {
diff --git a/lib/cloudcmd.js b/lib/cloudcmd.js
index 76aa7765..487a1d0b 100644
--- a/lib/cloudcmd.js
+++ b/lib/cloudcmd.js
@@ -90,12 +90,12 @@
         });
         
         if (p.socket)
-            listen(p.socket);
+            listen(prefix, p.socket);
         
         return cloudcmd(prefix, p.socket);
     };
     
-    function listen(socket) {
+    function listen(prefix, socket) {
         var size = cloudfunc.MAX_SIZE;
         
         Util.check(arguments, ['socket']);
@@ -106,24 +106,29 @@
         
         edward.listen(socket, {
             size: size,
-            root: root
+            root: root,
+            prefix: prefix + '/edward'
         });
         
         dword.listen(socket, {
             size: size,
-            root: root
+            root: root,
+            prefix: prefix + '/dword'
         });
         
         spero.listen(socket, {
-            root: root
+            root: root,
+            prefix: prefix + '/spero'
         });
         
         remedy.listen(socket, {
-            root: root
+            root: root,
+            prefix: prefix + '/remedy'
         });
         
         ishtar.listen(socket, {
-            root: root
+            root: root,
+            prefix: prefix + '/ishtar'
         });
     }