Merge branch 'beta' of github.com:ajaxorg/cloud9 into issues/1437

gero3 · Jun 8, 2012 · 4974660 · 4974660
2 parents 119f3af + dd5d5b8
commit 4974660
Show file tree

Hide file tree

Showing 33 changed files with 248 additions and 5,204 deletions.
diff --git a/plugins-client/cloud9.core/www/core/ide.js b/plugins-client/cloud9.core/www/core/ide.js
@@ -24,7 +24,8 @@ define(function(require, exports, module) {
         this.workspaceId    = window.cloud9config.workspaceId;
         this.readonly       = window.cloud9config.readonly;
         this.projectName    = window.cloud9config.projectName;
-
+        this.local          = window.cloud9config.local;
+
         this.loggedIn       = true;
 
         this.onLine         = false;

diff --git a/plugins-client/ext.panels/panels.js b/plugins-client/ext.panels/panels.js
@@ -68,18 +68,12 @@ module.exports = ext.register("ext/panels/panels", {
             }
         });
 
-        var setDefaultPanel = function (e){
+        // for local version
+        if (ide.dispatchEvent("panels.activateDefault") !== false) {
             var active = settings.model.queryValue("auto/panels/@active");
-        	if ((panelExt["default"] && !active || active == panelExt.path) 
-              && (!e || e.currentTarget.workspaceId !== "generic"))
-            	_self.activate(panelExt, null, true);
+            if ((panelExt["default"] && !active || active == panelExt.path))
+                _self.activate(panelExt, null, true);
         }
-
-        if (cloud9config.local) {
-            ide.addEventListener("init.ext/remotecontrol/remotecontrol", setDefaultPanel);
-        }
-        else
-            setDefaultPanel();
     },
 
     animate : function(win, toWin, toWidth){

diff --git a/plugins-client/ext.remotecontrol/remotecontrol.js b/plugins-client/ext.remotecontrol/remotecontrol.js
@@ -24,6 +24,12 @@ module.exports = ext.register("ext/remotecontrol/remotecontrol", {
     init : function(amlNode) {
         var _self = this;
 
+        ide.addEventListener("panels.activateDefault", function (e) {
+            if (e.currentTarget.workspaceId === "generic")
+                return false;
+            return true;
+        });
+
         ide.addEventListener("socketMessage", function (event) {
             _self.loadFileOrFolder(event); 
         });

diff --git a/plugins-client/ext.searchinfiles/searchinfiles.js b/plugins-client/ext.searchinfiles/searchinfiles.js
@@ -383,7 +383,7 @@ module.exports = ext.register("ext/searchinfiles/searchinfiles", apf.extend({
                     selectstyle       : "[{require('core/settings').model}::editors/code/@selectstyle]",
                     activeline        : "[{require('core/settings').model}::editors/code/@activeline]",
                     gutterline        : "[{require('core/settings').model}::editors/code/@gutterline]",
-                    showinvisibles    : "[{require('core/settings').model}::editors/code/@showinvisibles]",
+                    showinvisibles    : "false",
                     showprintmargin   : "false",
                     softtabs          : "[{require('core/settings').model}::editors/code/@softtabs]",
                     tabsize           : "[{require('core/settings').model}::editors/code/@tabsize]",

diff --git a/plugins-client/ext.themes/themes.js b/plugins-client/ext.themes/themes.js
@@ -80,22 +80,39 @@ module.exports = ext.register("ext/themes/themes", {
                 _self.setThemedGUI(path);
             }, 10);
         }
+        // fixes a problem with Ace architect loading /lib/ace, 
+        // creating a conflict with themes
+        if (theme.isDark === undefined) {
+            return setTimeout(function(){
+                _self.setThemedGUI(path);
+            }, 10);
+        }
 
         ide.dispatchEvent("theme.change", {theme: theme, path: path});
 
-        var div = hboxMain.$ext;
+        var editorDiv = hboxMain.$ext;
+        var tabsDiv = tabEditors.$buttons;
+        editorDiv.setAttribute("id", "editorDiv");
+        tabsDiv.setAttribute("id", "tabsDiv");
 
-        if (theme.isDark)
-            apf.setStyleClass(div, "dark");
-        else
-            apf.setStyleClass(div, "", ["dark"]);
+        if (theme.isDark) {
+            apf.setStyleClass(editorDiv, "dark");
+            apf.setStyleClass(tabsDiv, "dark");
+        }
+        else {
+            apf.setStyleClass(editorDiv, "", ["dark"]);
+            apf.setStyleClass(tabsDiv, "", ["dark"]);
+        }
 
         var cssClass = theme.cssClass;
 
-        if (_self.lastTheme)
-            apf.setStyleClass(div, "", [_self.lastTheme]);
+        if (_self.lastTheme) {
+            apf.setStyleClass(editorDiv, "", [_self.lastTheme]);
+             apf.setStyleClass(tabsDiv, "", [_self.lastTheme]);
+        }
 
-        apf.setStyleClass(div, _self.lastTheme = cssClass);
+        apf.setStyleClass(editorDiv, _self.lastTheme = cssClass);
+        apf.setStyleClass(tabsDiv, _self.lastTheme = cssClass);
 
         if (_self.loaded[path])
             return;
@@ -108,8 +125,8 @@ module.exports = ext.register("ext/themes/themes", {
         apf.importStylesheet([
             ["." + cssClass + " .ace_editor",
              "border: 0 !important;"],
-            ["body." + cssClass + " > .vbox, "
-             + "." + cssClass + " .editor_tab .curbtn .tab_middle, "
+            ["#editorDiv." + cssClass + " > .vbox, "
+             + "#tabsDiv." + cssClass + " .curbtn .tab_middle, "
              + "." + cssClass + " .codeditorHolder, "
              + "." + cssClass + " .winGoToFile, "
              + "." + cssClass + " .revisionsBar .topbar, "

diff --git a/plugins-client/ext.tree/tree.xml b/plugins-client/ext.tree/tree.xml
@@ -85,6 +85,7 @@
                     trFiles.selected ? trFiles.selected.parentNode : trFiles.getFirstTraverseNode());
                 apf.clipboard.store = store;
             ">Duplicate</a:item>
+            <a:divider />
             <a:item match="[file|folder[not(@root)]]" command="cut">Cut</a:item>
             <a:item match="[file|folder[not(@root)]]" command="copy">Copy</a:item>
             <a:item match="[file|folder|project]" disabled="{apf.clipboard.empty}" command="paste">Paste</a:item>

diff --git a/plugins-client/lib.ace/www/theme/theme-clouds.js b/plugins-client/lib.ace/www/theme/theme-clouds.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #FFFBD1;\
 }\
 \
+.ace-clouds .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-clouds .ace_marker-layer .ace_selected_word {\
   border: 1px solid #BDD5FC;\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-clouds_midnight.js b/plugins-client/lib.ace/www/theme/theme-clouds_midnight.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: rgba(215, 215, 215, 0.031);\
 }\
 \
+.ace-clouds-midnight .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-clouds-midnight .ace_marker-layer .ace_selected_word {\
   border: 1px solid #000000;\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-cobalt.js b/plugins-client/lib.ace/www/theme/theme-cobalt.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: rgba(0, 0, 0, 0.35);\
 }\
 \
+.ace-cobalt .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-cobalt .ace_marker-layer .ace_selected_word {\
   border: 1px solid rgba(179, 101, 57, 0.75);\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-dawn.js b/plugins-client/lib.ace/www/theme/theme-dawn.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: rgba(36, 99, 180, 0.12);\
 }\
 \
+.ace-dawn .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-dawn .ace_marker-layer .ace_selected_word {\
   border: 1px solid rgba(39, 95, 255, 0.30);\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-idle_fingers.js b/plugins-client/lib.ace/www/theme/theme-idle_fingers.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #353637;\
 }\
 \
+.ace-idle-fingers .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-idle-fingers .ace_marker-layer .ace_selected_word {\
   border: 1px solid rgba(90, 100, 126, 0.88);\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-kr_theme.js b/plugins-client/lib.ace/www/theme/theme-kr_theme.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #38403D;\
 }\
 \
+.ace-kr-theme .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-kr-theme .ace_marker-layer .ace_selected_word {\
   border: 1px solid rgba(170, 0, 255, 0.45);\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-merbivore.js b/plugins-client/lib.ace/www/theme/theme-merbivore.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #333435;\
 }\
 \
+.ace-merbivore .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-merbivore .ace_marker-layer .ace_selected_word {\
   border: 1px solid #454545;\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-merbivore_soft.js b/plugins-client/lib.ace/www/theme/theme-merbivore_soft.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #333435;\
 }\
 \
+.ace-merbivore-soft .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-merbivore-soft .ace_marker-layer .ace_selected_word {\
   border: 1px solid #494949;\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-mono_industrial.js b/plugins-client/lib.ace/www/theme/theme-mono_industrial.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: rgba(12, 13, 12, 0.25);\
 }\
 \
+.ace-mono-industrial .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-mono-industrial .ace_marker-layer .ace_selected_word {\
   border: 1px solid rgba(145, 153, 148, 0.40);\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-monokai.js b/plugins-client/lib.ace/www/theme/theme-monokai.js
@@ -94,11 +94,11 @@ exports.cssText = "\
   border: 1px solid #49483E;\
 }\
 \
-.ace-monokai .ace_marker-layer .ace_active_line{\
+.ace-monokai .ace_marker-layer .ace_active_line {\
   background: #49483E;\
 }\
-.ace-monokai .ace_gutter_active_line{\
-  background: #191916;\
+.ace-monokai .ace_gutter_active_line {\
+  background-color: #191916;\
 }\
 \
 .ace-monokai .ace_marker-layer .ace_selected_word {\

diff --git a/plugins-client/lib.ace/www/theme/theme-pastel_on_dark.js b/plugins-client/lib.ace/www/theme/theme-pastel_on_dark.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: rgba(255, 255, 255, 0.031);\
 }\
 \
+.ace-pastel-on-dark .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-pastel-on-dark .ace_marker-layer .ace_selected_word {\
   border: 1px solid rgba(221, 240, 255, 0.20);\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-solarized_dark.js b/plugins-client/lib.ace/www/theme/theme-solarized_dark.js
@@ -97,8 +97,9 @@ exports.cssText = "\
 .ace-solarized-dark .ace_marker-layer .ace_active_line {\
   background: #073642;\
 }\
-.ace-solarized-dark .ace_gutter_active_line{\
-  background: #0d3440;\
+\
+.ace-solarized-dark .ace_gutter_active_line {\
+  background-color: #0d3440;\
 }\
 \
 .ace-solarized-dark .ace_marker-layer .ace_selected_word {\

diff --git a/plugins-client/lib.ace/www/theme/theme-solarized_light.js b/plugins-client/lib.ace/www/theme/theme-solarized_light.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #EEE8D5;\
 }\
 \
+.ace-solarized-light .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-solarized-light .ace_marker-layer .ace_selected_word {\
   border: 1px solid #073642;\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-tomorrow.js b/plugins-client/lib.ace/www/theme/theme-tomorrow.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #EFEFEF;\
 }\
 \
+.ace-tomorrow .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-tomorrow .ace_marker-layer .ace_selected_word {\
   border: 1px solid #D6D6D6;\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-tomorrow_night.js b/plugins-client/lib.ace/www/theme/theme-tomorrow_night.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #282A2E;\
 }\
 \
+.ace-tomorrow-night .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-tomorrow-night .ace_marker-layer .ace_selected_word {\
   border: 1px solid #373B41;\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-tomorrow_night_blue.js b/plugins-client/lib.ace/www/theme/theme-tomorrow_night_blue.js
@@ -94,11 +94,12 @@ exports.cssText = "\
   border: 1px solid #404F7D;\
 }\
 \
-.ace-tomorrow-night-blue .ace_marker-layer .ace_active_line{\
+.ace-tomorrow-night-blue .ace_marker-layer .ace_active_line {\
   background: #00346E;\
 }\
-.ace-tomorrow-night-blue .ace_gutter_active_line{\
-  background: #022040;\
+\
+.ace-tomorrow-night-blue .ace_gutter_active_line {\
+  background-color: #022040;\
 }\
 \
 .ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word {\

diff --git a/plugins-client/lib.ace/www/theme/theme-tomorrow_night_bright.js b/plugins-client/lib.ace/www/theme/theme-tomorrow_night_bright.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #2A2A2A;\
 }\
 \
+.ace-tomorrow-night-bright .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-tomorrow-night-bright .ace_marker-layer .ace_selected_word {\
   border: 1px solid #424242;\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-tomorrow_night_eighties.js b/plugins-client/lib.ace/www/theme/theme-tomorrow_night_eighties.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #393939;\
 }\
 \
+.ace-tomorrow-night-eighties .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-tomorrow-night-eighties .ace_marker-layer .ace_selected_word {\
   border: 1px solid #515151;\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-twilight.js b/plugins-client/lib.ace/www/theme/theme-twilight.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: rgba(255, 255, 255, 0.031);\
 }\
 \
+.ace-twilight .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-twilight .ace_marker-layer .ace_selected_word {\
   border: 1px solid rgba(221, 240, 255, 0.20);\
 }\

diff --git a/plugins-client/lib.ace/www/theme/theme-vibrant_ink.js b/plugins-client/lib.ace/www/theme/theme-vibrant_ink.js
@@ -98,6 +98,10 @@ exports.cssText = "\
   background: #333333;\
 }\
 \
+.ace-vibrant-ink .ace_gutter_active_line {\
+  background-color : #dcdcdc;\
+}\
+\
 .ace-vibrant-ink .ace_marker-layer .ace_selected_word {\
   border: 1px solid #6699CC;\
 }\