Wed Mar 7 04:56:37 CET 2018

build/standalone/config/default.js

@@ -2106,6 +2106,9 @@ define("plugins/c9.ide.collab/chat/chat",[], function(require, exports, module)
             html.id = "ot_chat_" + msg.id;
             html.userId = msg.userId;
             
+            if (msg.userId == workspace.myUserId)
+                html.className = "you";
+
             var borderEl = document.createElement("span");
             html.appendChild(borderEl);
             borderEl.className = "chatBorder";
@@ -72381,11 +72384,8 @@ define("plugins/c9.ide.layout.classic/preload",[], function(require, exports, mo
                 ["skin", options.defaultTheme || "flat-dark"]
             ]);
             if (!packed || options.loadTheme) return callback();
-            try {
             var theme = settings.get("user/general/@skin");
             return getTheme(theme, callback);
-            } catch (e) {}
-            async.forEach(Object.keys(themes), getTheme, callback);
         }
 
         function getTheme(name, callback) {
@@ -72399,6 +72399,8 @@ define("plugins/c9.ide.layout.classic/preload",[], function(require, exports, mo
             } else {
                 var url = themePrefix + "/" + name + ".css";
                 require(["text!" + url], function(data) {
+                    if (!data)
+                        return callback(new Error());
                     data += "\n/*# sourceURL=" + url + " */";
                     themes[name] = data;
                     callback(null, data);
@@ -72421,6 +72423,195 @@ define("plugins/c9.ide.layout.classic/preload",[], function(require, exports, mo
     }
 });
 
+define("plugins/c9.ide.theme.jett/plugin",[], function(require, exports, module) {
+
+    main.consumes = [
+        "Plugin", "layout", "app",
+        "util", "tabManager", "ace",
+    ];
+    main.provides = ["theme.jett"];
+    return main;
+    function main(options, imports, register) {
+        var Plugin = imports.Plugin;
+        var layout = imports.layout;
+        var tabs = imports.tabManager;
+        var ace = imports.ace;
+        var services = imports.app.services;
+        
+        var escapeHTML = require("ace/lib/lang").escapeHTML;
+
+        var plugin = new Plugin("Ajax.org", main.consumes);
+        var emit = plugin.getEmitter();
+
+        var themeEnabled = false;
+        function load() {
+            ace.addTheme({
+                caption: "Jett",
+                id: "plugins/c9.ide.theme.jett/ace.themes/jett"
+            }, plugin);
+            layout.addTheme({
+                group: "flat",
+                color: "rgb(41, 58, 86)",
+                name: "jett-dark",
+                defaults: {
+                    output: {
+                        backgroundColor: "#2b303b",
+                        foregroundColor: "#767B85",
+                        selectionColor: "#343d46",
+                    },
+                    
+                }
+            });
+
+            layout.on("themeChange", function(e) {
+                if (e.theme == "jett-dark")
+                    enableJett(true);
+                else if (themeEnabled)
+                    enableJett(false);
+            });
+
+            layout.on("themeDefaults", function(e) {
+            });
+        }
+        function enableJett(enabled) {
+            themeEnabled = enabled;
+            if (enabled) {
+                ace.on("themeChange", styleTabs, plugin);
+                tabs.on("focusSync", styleTabs, plugin);
+                tabs.on("tabCreate", onTabCreate, plugin);
+                enableFileIcons();
+            }
+            else {
+                ace.off("themeChange", styleTabs, plugin);
+                tabs.off("focusSync", styleTabs, plugin);
+                tabs.off("tabCreate", onTabCreate, plugin);
+            }
+            styleTabs();
+            var tree = services.tree && services.tree.tree;
+            tree && tree.resize(true);
+        }
+
+        function onTabCreate(e) {
+            if (themeEnabled && e.tab.title && e.tab.path) {
+                setTabIcon(e.tab);
+            }
+        }
+        
+        function enableFileIcons() {
+            if (enableFileIcons.called)
+                return;
+            enableFileIcons.called = true;
+            var navigate = services.navigate;
+            navigate && navigate.once("draw", function() {
+                var dp = navigate.tree.provider;
+
+                override(dp, 'renderRow', function(original) {
+                    return function(row, html, config) {
+                        if (!themeEnabled) {
+                            return original.apply(this, arguments);
+                        }
+
+                        var path = dp.visibleItems[row];
+                        var isSelected = dp.isSelected(row);
+                        var filename = path.substr(path.lastIndexOf("/") + 1);
+                        var icon = getIconClass(filename);
+
+                        html.push("<div class='item " + (isSelected ? "selected " : "")
+                            + dp.getClassName(row) + "' style='height:" + dp.innerRowHeight + "px'><span class='filetree-icon " + icon + "'>"
+                            + dp.replaceStrong(filename) + "</span><small class='path'>" + dp.replaceStrong(path) + "</small></div>");
+                    };
+                });
+            });
+            var tree = services.tree;
+            tree.once("draw", function(e) {
+                override(tree.tree.model, 'getIconHTML', function(original) {
+                    return function(node) {
+                        if (!themeEnabled) {
+                            return original.apply(this, arguments);
+                        }
+
+                        var icon = node.isFolder ? "folder" : getIconClass(node.label);
+
+                        if (node.status === "loading") icon = "loading";
+                        return "<span class='filetree-icon " + icon + "'></span>";
+                    };
+                });
+            });
+        }
+        function override(object, methodName, callback) {
+            object[methodName] = callback(object[methodName]);
+        }
+        function getIconClass(filename) {
+            if (!filename) return '';
+            filename = filename.split("/").pop();
+            var icon = filename.split(".").pop().toLowerCase();
+
+            filename = filename.toLowerCase();
+            if (filename == "package.json") icon = "npm";
+            if (filename == "composer.json") icon = "composer";
+            if (filename == "bower.json") icon = "bower";
+            if (filename == "gulpfile.js") icon = "gulp";
+            if (filename == "gruntfile.js") icon = "grunt";
+
+            return icon;
+        }
+        function styleTabs(e) {
+            var panes = tabs.getPanes();
+
+            panes.forEach(function(pane) {
+                pane.getTabs().forEach(function(tab) {
+                    setTabIcon(tab);
+                    if (themeEnabled && tab.isActive()) {
+                        if (ace.theme && ace.theme.bg && ace.theme.fg) {
+                            var colorHash = {
+                                "editor::ace": ace.theme.bg,
+                                "editor::terminal": "#000",
+                                "editor::output": "#000",
+                                "editor::preferences": "#25272C",
+                                "editor::immediate": "#1C1D21"
+                            };
+    
+                            tab.aml.$button.style.backgroundColor = (colorHash[tab.aml.type] || "iherit");
+                            tab.aml.$button.style.color = ace.theme.fg;
+                        }
+                    }
+                    else {
+                        tab.aml.$button.style.backgroundColor = '';
+                        tab.aml.$button.style.color = '';
+                    }
+                    
+                });
+            });
+        }
+        function setTabIcon(tab) {
+            if (!tab.path) return;
+
+            var iconHTML = (themeEnabled ? '<span class="filetree-icon '
+                + getIconClass(tab.path)
+                + '"></span>' : "")
+                + escapeHTML(tab.title);
+            tab.aml.$button.querySelector(".sessiontab_title").innerHTML = iconHTML;
+
+        }
+
+        plugin.on("load", function() {
+            load();
+        });
+        plugin.on("unload", function() {
+            enableJett(false);
+            themeEnabled = false;
+        });
+        plugin.freezePublicAPI({
+
+        });
+
+        register(null, {
+            "theme.jett": plugin
+        });
+
+    }
+});
+
 define("plugins/c9.ide.theme.flat/flat-dark",[], function(require, exports, module) {
     main.consumes = [
         "Plugin", "layout", "menus", "tabinteraction", "settings",
@@ -72949,14 +73140,18 @@ define("plugins/c9.ide.layout.classic/layout",[], function(require, exports, mod
             emit("draw");
         }
         
-        var allowedThemes = { 
+        var allowedThemes = {};
-            "dark": 1, 
+        
-            "dark-gray": 1, 
+        function addTheme(data) {
-            "light-gray": 1, 
+            allowedThemes[data.name] = data;
-            "light": 1,
+            emit("themeAdded", data);
-            "flat-light": 1, 
+        }
-            "flat-dark": 1
+        
-        };
+        function listThemes() {
+           return Object.keys(allowedThemes).map(function(key) {
+               return allowedThemes[key];
+           });
+        }
         
         function setImageResolution(value) {
             if (window.matchMedia) {
@@ -72969,8 +73164,6 @@ define("plugins/c9.ide.layout.classic/layout",[], function(require, exports, mod
         
         function updateTheme(noquestion, type) {
             var sTheme = settings.get("user/general/@skin");
-            if (!allowedThemes[sTheme])
-                sTheme = "dark";
             
             if (noquestion === undefined)
                 noquestion = !theme;
@@ -72981,17 +73174,22 @@ define("plugins/c9.ide.layout.classic/layout",[], function(require, exports, mod
                 theme = sTheme;
                 
                 if (ui.packedThemes) {
-                    preload.getTheme(theme, function(err, theme) {
+                    preload.getTheme(theme, function(err, themeCss) {
-                        if (err)
+                        if (sTheme !== theme)
                             return;
+                        if (err) {
+                            if (!allowedThemes[sTheme])
+                                settings.set("user/general/@skin", "dark");
+                            return;
+                        }
                         if (removeTheme)
                             removeTheme();
                         var url = options.staticPrefix.replace(/c9.ide.layout.classic\/?$/, "");
-                        theme = theme.replace(/(url\(["']?)\/static\/plugins\//g, function(_, x) {
+                        themeCss = themeCss.replace(/(url\(["']?)\/static\/plugins\//g, function(_, x) {
                             return x + url;
                         });
-                        theme = setImageResolution(theme);
+                        themeCss = setImageResolution(themeCss);
-                        ui.insertCss(theme, false, {
+                        ui.insertCss(themeCss, false, {
                             addOther: function(remove) { removeTheme = remove; }
                         });
                         changeTheme();
@@ -73361,6 +73559,8 @@ define("plugins/c9.ide.layout.classic/layout",[], function(require, exports, mod
             get hasTheme() {
                 return !ui.packedThemes || !!removeTheme
             },
+            addTheme: addTheme,
+            listThemes: listThemes,
             findParent: findParent,
             initMenus: initMenus,
             resetTheme: resetTheme,
@@ -112140,12 +112340,14 @@ apf.splitter.templates = {
                 }
     
                 apf.plane.setCursor(_self.type == "vertical" ? "ew-resize" : "ns-resize");
+                _self.$ext.classList.add("hover");
     
                 _self.$setStyleClass(this, _self.$baseCSSname + "Moving");
                 document.onmouseup = function(e) {
                     if (!e) e = event;
                     
                     _self.$setStyleClass(_self.$ext, "", [_self.$baseCSSname + "Moving"]);
+                    _self.$ext.classList.remove("hover");
                     
                     update(e, true);
                     
@@ -142995,7 +143197,7 @@ define("plugins/c9.ide.ace.stripws/stripws",[], function(require, exports, modul
 define("plugins/c9.ide.ace/themes",[], function(require, exports, module) {
     main.consumes = [
         "PreferencePanel", "ace", "ui", "configure", "settings", 
-        "preferences.experimental"
+        "preferences.experimental", "layout"
     ];
     main.provides = ["preferences.themes"];
     return main;
@@ -143004,6 +143206,7 @@ define("plugins/c9.ide.ace/themes",[], function(require, exports, module) {
         var PreferencePanel = imports.PreferencePanel;
         var ui = imports.ui;
         var ace = imports.ace;
+        var layout = imports.layout;
         var configure = imports.configure;
         var settings = imports.settings;
         var experimental = imports["preferences.experimental"];
@@ -143019,24 +143222,47 @@ define("plugins/c9.ide.ace/themes",[], function(require, exports, module) {
             index: 300
         });
         var intro;
+        var themeContainers = {};
+        var themes = [];
         
         var loaded = false;
         function load() {
             if (loaded) return false;
             loaded = true;
             
-            function update() {
+            layout.addTheme({
-                if (!drawn) return;
+                group: "classic",
-                
+                color: "#252525;", 
-                var list = getThemes();
+                name: "dark",
-                plugin.form.update([{
+            });
-                    id: "syntax",
+            layout.addTheme({
-                    items: list
+                group: "classic",
-                }]);
+                color: "#3f3f3f;",
-            }
+                name: "dark-gray",
-            
+            });
-            ace.on("addTheme", update);
+            layout.addTheme({
-            ace.on("removeTheme", update);
+                group: "classic",
+                color: "#aaa;", 
+                name: "light-gray",
+                hidden: !options.lightClassic,
+            });
+            layout.addTheme({
+                group: "classic",
+                color: "#dcdbdb;", 
+                name: "light",
+                hidden: !options.lightClassic,
+            });
+            layout.addTheme({
+                group: "flat",
+                color: "#252525;", 
+                name: "flat-dark",
+                hidden: !FLATDARK
+            });
+            layout.addTheme({
+                group: "flat",
+                color: "#dcdbdb;", 
+                name: "flat-light",
+            });
         }
         
         var drawn;
@@ -143046,23 +143272,6 @@ define("plugins/c9.ide.ace/themes",[], function(require, exports, module) {
             
             var list = getThemes();
 
-            var rb1, rb2, rb3, rb4, rb5, rb6;
-            
-            var flatThemes = [];
-            rb6 = new ui.radiobutton({ 
-                group: "theme-color", 
-                class: "themepicker", 
-                style: "background:#252525;", 
-                value: "flat-dark"
-            });
-            rb5 = new ui.radiobutton({ 
-                group: "theme-color", 
-                class: "themepicker", 
-                style: "background:#dcdbdb;", 
-                value: "flat-light"
-            });
-            if (FLATDARK) flatThemes.push(rb6);
-            flatThemes.push(rb5);
             
             plugin.form.add([
                 {
@@ -143089,9 +143298,7 @@ define("plugins/c9.ide.ace/themes",[], function(require, exports, module) {
                                 caption: "Flat Theme:", 
                                 style: "padding-top:5px" 
                             }),
-                            new ui.bar({
+                            themeContainers.flat = new ui.bar({})
-                                childNodes: flatThemes
-                            })
                         ]
                     })
                 },
@@ -143109,22 +143316,7 @@ define("plugins/c9.ide.ace/themes",[], function(require, exports, module) {
                                 caption: "Classic Theme:", 
                                 style: "padding-top:5px" 
                             }),
-                            new ui.bar({
+                            themeContainers.classic = new ui.bar({})
-                                childNodes: [
-                                    rb1 = new ui.radiobutton({ 
-                                        group: "theme-color", 
-                                        class: "themepicker", 
-                                        style: "background:#252525;", 
-                                        value: "dark" 
-                                    }),
-                                    rb2 = new ui.radiobutton({ 
-                                        group: "theme-color", 
-                                        class: "themepicker", 
-                                        style: "background:#3f3f3f;", 
-                                        value: "dark-gray" 
-                                    }),
-                                ]
-                            })
                         ]
                     })
                 },
@@ -143142,21 +143334,19 @@ define("plugins/c9.ide.ace/themes",[], function(require, exports, module) {
                 },
             ], plugin);
             
-            var change = function(e) {
-                settings.set("user/general/@skin", e.value);
-            };
-            var setTheme = function(e) {
-                [rb1, rb2, rb5, rb6].some(function(rb) {
-                    if (rb.value == e.value) {
-                        rb.select();
-                        return true;
-                    }
-                });
-            };
-            settings.on("user/general/@skin", setTheme);
-            setTheme({ value: settings.get("user/general/@skin") });
             
-            rb1.$group.on("afterchange", change);
+            function update() {
+                if (!drawn) return;
+                
+                var list = getThemes();
+                plugin.form.update([{
+                    id: "syntax",
+                    items: list
+                }]);
+            }
+            
+            ace.on("addTheme", update, plugin);
+            ace.on("removeTheme", update, plugin);
             
             ui.buildDom([
                 ["h1", null, "Themes"],
@@ -143166,6 +143356,31 @@ define("plugins/c9.ide.ace/themes",[], function(require, exports, module) {
                 ],
                 ["p", { class: "hint" }, "Set all the colors free!"]
             ], intro.$int);
+            
+            
+            themeContainers.group = new apf.group();
+            
+            layout.on("themeAdded", drawThemeSwatches);
+            drawThemeSwatches();
+            
+            var change = function(e) {
+                settings.set("user/general/@skin", e.value);
+            };
+            var setTheme = function(e) {
+                [].concat(
+                    themeContainers.flat.childNodes,
+                    themeContainers.classic.childNodes
+                ).some(function(rb) {
+                    if (rb.value == e.value) {
+                        rb.select();
+                        return true;
+                    }
+                });
+            };
+            settings.on("user/general/@skin", setTheme, plugin);
+            setTheme({ value: settings.get("user/general/@skin") });
+            
+            themeContainers.group.on("afterchange", change);
         }
 
         function getThemes() {
@@ -143183,6 +143398,31 @@ define("plugins/c9.ide.ace/themes",[], function(require, exports, module) {
             return list;
         }
         
+        
+        function drawThemeSwatches() {
+            var themes = layout.listThemes();
+            themeContainers.classic.childNodes.forEach(function(n) {
+                n.remove();
+            });
+            themeContainers.flat.childNodes.forEach(function(n) {
+                n.remove();
+            });
+            
+            themes.forEach(function(theme) {
+                if (theme.hidden) return;
+                var container = theme.group == "flat" ? themeContainers.flat : themeContainers.classic;
+                container.appendChild(
+                    new ui.radiobutton({
+                        group: themeContainers.group, 
+                        class: "themepicker", 
+                        style: "background:" + theme.color, 
+                        value: theme.name,
+                        tooltip: theme.name,
+                    })
+                );
+            });
+        }
+        
         plugin.on("load", function() {
             load();
         });
@@ -143192,6 +143432,8 @@ define("plugins/c9.ide.ace/themes",[], function(require, exports, module) {
         plugin.on("unload", function() {
             loaded = false;
             drawn = false;
+            intro = null;
+            themeContainers = {};
         });
         plugin.freezePublicAPI({
             
@@ -145496,6 +145738,7 @@ define("plugins/c9.ide.ace/ace",[], function(require, exports, module) {
         var currentTheme;
         var skin = settings.get("user/general/@skin");
         var defaultThemes = {
+            "jett-dark": "plugins/c9.ide.theme.jett/ace.themes/jett",
             "light": "ace/theme/cloud9_day",
             "light-gray": "ace/theme/cloud9_day",
             "flat-light": "ace/theme/cloud9_day",
@@ -145922,7 +146165,7 @@ define("plugins/c9.ide.ace/ace",[], function(require, exports, module) {
                 var style = currentTheme && (currentTheme.isDark ? "dark" : "light");
                 if (e.force == false && e.theme.indexOf(style) != -1)
                     return;
-                if (e.type != "ace")
+                if (e.type != "ace" && defaultThemes[e.theme])
                     handle.setTheme(defaultThemes[e.theme]);
             }, handle);
             ui.insertCss(cssString, null, handle);
@@ -146614,8 +146857,10 @@ define("plugins/c9.ide.ace/ace",[], function(require, exports, module) {
                 }
             }), index == -1 ? undefined : index || themeCounter++, plugin || handle);
         }
-        function addTheme(css, plugin) {
+        function addTheme(theme, plugin) {
-            var theme = { cssText: css };
+            if (typeof theme == "string") {
+                var css = theme;
+                theme = { cssText: css };
                 var firstLine = css.split("\n", 1)[0].replace(/\/\*|\*\//g, "").trim();
                 firstLine.split(";").forEach(function(n) {
                     if (!n) return;
@@ -146623,13 +146868,18 @@ define("plugins/c9.ide.ace/ace",[], function(require, exports, module) {
                     theme[info[0].trim()] = info[1].trim();
                 });
                 theme.isDark = theme.isDark == "true";
-            
                 theme.id = "custom_themes/" + theme.name;
                 theme.customCss = css;
+            }
+            
             define.undef(theme.id);
+            if (theme.cssText)
                 define(theme.id, [], theme);
             
-            themes[theme.id] = theme;
+            if (!theme.name)
+                theme.name = theme.caption;
+            
+            themes[theme.caption || theme.id] = theme.id;
             
             addThemeMenu(theme.name, theme.id, null, plugin);
             
@@ -151267,9 +151517,9 @@ define("plugins/c9.ide.editors/tabmanager",[], function(require, module, exports
             });
             settings.on("read", function(e) {
                 settings.setDefaults("user/tabs", [
-                    ["show", "true"], 
+                    ["show", true], 
-                    ["title", "false"],
+                    ["title", false],
-                    ["asterisk", "false"]
+                    ["asterisk", false]
                 ]);
                 settings.setDefaults("state/tabs", []);
                 collapsedMenu = settings.getBool("state/menus/@minimized");
@@ -151312,7 +151562,7 @@ define("plugins/c9.ide.editors/tabmanager",[], function(require, module, exports
             
             settings.on("user/tabs/@asterisk", function(value) {
                 containers.forEach(function(container) {
-                    if (value)
+                    if (ui.isTrue(value))
                         ui.setStyleClass(container, "asterisk");
                     else
                         ui.setStyleClass(container, "", ["asterisk"]);

build/standalone/modules/plugins/c9.ide.theme.jett/ace.themes/jett.js

@@ -0,0 +1,11 @@
+define("text!plugins/c9.ide.theme.jett/ace.themes/jett.css",[],".ace-jett .ace_gutter {\n  background: #1C1D21;\n  color: #686b78\n}\n\n.ace-jett .ace_print-margin {\n  width: 0px;\n}\n\n.ace-jett {\n  background-color: #1C1D21;\n  color: #cbcdd2\n}\n\n.ace-jett .ace_cursor {\n  color: #cbcdd2\n}\n\n.ace-jett .ace_marker-layer .ace_selection {\n  background: #2f3137\n}\n\n.ace-jett.ace_multiselect .ace_selection.ace_start {\n  box-shadow: 0 0 3px 0px #1C1D21;\n  border-radius: 2px\n}\n\n.ace-jett .ace_marker-layer .ace_step {\n  background: #212227\n}\n\n.ace-jett .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid #65737e\n}\n\n.ace-jett .ace_marker-layer .ace_active-line {\n  background: #212227\n}\n\n.ace-jett .ace_gutter-active-line {\n  background-color: #212227;\n}\n\n.ace-jett .ace_marker-layer .ace_selected-word {\n  border: 1px solid #4f5b66\n}\n\n.ace-jett .ace_fold {\n  background-color: #8fa1b3;\n  border-color: #cbcdd2\n}\n\n.ace-jett .ace_keyword {\n  color: #78bd65\n}\n\n.ace-jett .ace_keyword.ace_operator {\n  color: #eb3d54\n}\n\n.ace-jett .ace_keyword.ace_other.ace_unit {\n  color: #ef7c2a\n}\n\n.ace-jett .ace_constant {\n  color: #ef7c2a\n}\n\n.ace-jett .ace_constant.ace_numeric {\n  color: #ef7c2a\n}\n\n.ace-jett .ace_constant.ace_character.ace_escape {\n  color: #ef7c2a\n}\n\n.ace-jett .ace_support.ace_function {\n  color: #eb3d54\n}\n\n.ace-jett .ace_support.ace_class {\n  color: #ffcb6b\n}\n\n.ace-jett .ace_support.ace_type {\n  color: #cbcdd2\n}\n\n.ace-jett .ace_storage {\n  color: #78bd65\n}\n\n.ace-jett .ace_invalid.ace_illegal {\n  color: #1C1D21;\n  background-color: #bf616a\n}\n\n.ace-jett .ace_string {\n  color: #4fb4d8\n}\n\n.ace-jett .ace_string.ace_regexp {\n  color: #80CBC4\n}\n\n.ace-jett .ace_comment {\n  color: #686b78\n}\n\n.ace-jett .ace_variable {\n  color: #e5cd52\n}\n\n.ace-jett .ace_meta.ace_tag {\n  color: #eb3d54\n}\n\n.ace-jett .ace_meta.ace_selector {\n  color: #78bd65\n}\n\n.ace-jett .ace_entity.ace_other.ace_attribute-name {\n  color: #FFCB6B\n}\n\n.ace-jett .ace_entity.ace_name.ace_function {\n  color: #e5cd52\n}\n\n.ace-jett .ace_entity.ace_name.ace_tag {\n  color: #ff5370\n}\n\n.ace-jett .ace_markup.ace_list {\n  color: rgba(255, 83, 112, 1.0)\n}\n\n.ace-jett .ace_indent-guide {\n  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAABCJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgICAgICAgICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyI+CiAgICAgICAgIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOkNvbXByZXNzaW9uPjU8L3RpZmY6Q29tcHJlc3Npb24+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjcyPC90aWZmOlhSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj43MjwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjE8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpDb2xvclNwYWNlPjE8L2V4aWY6Q29sb3JTcGFjZT4KICAgICAgICAgPGV4aWY6UGl4ZWxZRGltZW5zaW9uPjI8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICAgICA8ZGM6c3ViamVjdD4KICAgICAgICAgICAgPHJkZjpCYWcvPgogICAgICAgICA8L2RjOnN1YmplY3Q+CiAgICAgICAgIDx4bXA6TW9kaWZ5RGF0ZT4yMDE2LTAyLTE3VDAwOjAyOjgwPC94bXA6TW9kaWZ5RGF0ZT4KICAgICAgICAgPHhtcDpDcmVhdG9yVG9vbD5QaXhlbG1hdG9yIDMuNC4yPC94bXA6Q3JlYXRvclRvb2w+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgoedQbwAAAAEklEQVQIHWMwsXGrZ2JgZGgAAAkvAbkhTCViAAAAAElFTkSuQmCC) right repeat-y\n}\n\n.ace-jett .ace_diff,\n.ace-jett .ace_diff.insert,\n.ace-jett .ace_diff.delete {\n  border-color: #4f5b66 !important;\n  background-color: rgba(79, 91, 102, 0.5) !important;\n}\n\n.ace-jett .ace_diff-connector {\n  stroke: #4f5b66;\n  fill: rgba(79, 91, 102, 0.6);\n}\n\n.ace_diff-gutter.ace-jett {\n  background-color: #1C1D21 !important;\n  border-right: 1px solid #464e5e !important;\n}");
+
+define("plugins/c9.ide.theme.jett/ace.themes/jett",[], function(require, exports, module) {
+
+exports.isDark = true;
+exports.cssClass = "ace-jett";
+exports.cssText = require("text!./jett.css");
+
+var dom = require("ace/lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
+});

build/standalone/static/plugins/c9.ide.theme.jett/ace.themes/jett.css

@@ -0,0 +1,158 @@
+.ace-jett .ace_gutter {
+  background: #1C1D21;
+  color: #686b78
+}
+
+.ace-jett .ace_print-margin {
+  width: 0px;
+}
+
+.ace-jett {
+  background-color: #1C1D21;
+  color: #cbcdd2
+}
+
+.ace-jett .ace_cursor {
+  color: #cbcdd2
+}
+
+.ace-jett .ace_marker-layer .ace_selection {
+  background: #2f3137
+}
+
+.ace-jett.ace_multiselect .ace_selection.ace_start {
+  box-shadow: 0 0 3px 0px #1C1D21;
+  border-radius: 2px
+}
+
+.ace-jett .ace_marker-layer .ace_step {
+  background: #212227
+}
+
+.ace-jett .ace_marker-layer .ace_bracket {
+  margin: -1px 0 0 -1px;
+  border: 1px solid #65737e
+}
+
+.ace-jett .ace_marker-layer .ace_active-line {
+  background: #212227
+}
+
+.ace-jett .ace_gutter-active-line {
+  background-color: #212227;
+}
+
+.ace-jett .ace_marker-layer .ace_selected-word {
+  border: 1px solid #4f5b66
+}
+
+.ace-jett .ace_fold {
+  background-color: #8fa1b3;
+  border-color: #cbcdd2
+}
+
+.ace-jett .ace_keyword {
+  color: #78bd65
+}
+
+.ace-jett .ace_keyword.ace_operator {
+  color: #eb3d54
+}
+
+.ace-jett .ace_keyword.ace_other.ace_unit {
+  color: #ef7c2a
+}
+
+.ace-jett .ace_constant {
+  color: #ef7c2a
+}
+
+.ace-jett .ace_constant.ace_numeric {
+  color: #ef7c2a
+}
+
+.ace-jett .ace_constant.ace_character.ace_escape {
+  color: #ef7c2a
+}
+
+.ace-jett .ace_support.ace_function {
+  color: #eb3d54
+}
+
+.ace-jett .ace_support.ace_class {
+  color: #ffcb6b
+}
+
+.ace-jett .ace_support.ace_type {
+  color: #cbcdd2
+}
+
+.ace-jett .ace_storage {
+  color: #78bd65
+}
+
+.ace-jett .ace_invalid.ace_illegal {
+  color: #1C1D21;
+  background-color: #bf616a
+}
+
+.ace-jett .ace_string {
+  color: #4fb4d8
+}
+
+.ace-jett .ace_string.ace_regexp {
+  color: #80CBC4
+}
+
+.ace-jett .ace_comment {
+  color: #686b78
+}
+
+.ace-jett .ace_variable {
+  color: #e5cd52
+}
+
+.ace-jett .ace_meta.ace_tag {
+  color: #eb3d54
+}
+
+.ace-jett .ace_meta.ace_selector {
+  color: #78bd65
+}
+
+.ace-jett .ace_entity.ace_other.ace_attribute-name {
+  color: #FFCB6B
+}
+
+.ace-jett .ace_entity.ace_name.ace_function {
+  color: #e5cd52
+}
+
+.ace-jett .ace_entity.ace_name.ace_tag {
+  color: #ff5370
+}
+
+.ace-jett .ace_markup.ace_list {
+  color: rgba(255, 83, 112, 1.0)
+}
+
+.ace-jett .ace_indent-guide {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAABCJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgICAgICAgICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyI+CiAgICAgICAgIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOkNvbXByZXNzaW9uPjU8L3RpZmY6Q29tcHJlc3Npb24+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjcyPC90aWZmOlhSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj43MjwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjE8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpDb2xvclNwYWNlPjE8L2V4aWY6Q29sb3JTcGFjZT4KICAgICAgICAgPGV4aWY6UGl4ZWxZRGltZW5zaW9uPjI8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICAgICA8ZGM6c3ViamVjdD4KICAgICAgICAgICAgPHJkZjpCYWcvPgogICAgICAgICA8L2RjOnN1YmplY3Q+CiAgICAgICAgIDx4bXA6TW9kaWZ5RGF0ZT4yMDE2LTAyLTE3VDAwOjAyOjgwPC94bXA6TW9kaWZ5RGF0ZT4KICAgICAgICAgPHhtcDpDcmVhdG9yVG9vbD5QaXhlbG1hdG9yIDMuNC4yPC94bXA6Q3JlYXRvclRvb2w+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgoedQbwAAAAEklEQVQIHWMwsXGrZ2JgZGgAAAkvAbkhTCViAAAAAElFTkSuQmCC) right repeat-y
+}
+
+.ace-jett .ace_diff,
+.ace-jett .ace_diff.insert,
+.ace-jett .ace_diff.delete {
+  border-color: #4f5b66 !important;
+  background-color: rgba(79, 91, 102, 0.5) !important;
+}
+
+.ace-jett .ace_diff-connector {
+  stroke: #4f5b66;
+  fill: rgba(79, 91, 102, 0.6);
+}
+
+.ace_diff-gutter.ace-jett {
+  background-color: #1C1D21 !important;
+  border-right: 1px solid #464e5e !important;
+}

configs/ide/default.js

@@ -511,6 +511,8 @@ module.exports = function(options) {
         },
         "plugins/c9.ide.theme.flat/flat-light",
         "plugins/c9.ide.theme.flat/flat-dark",
+        "plugins/c9.ide.theme.jett/plugin",
+
         {
             packagePath: "plugins/c9.ide.layout.classic/preload",
             themePrefix: options.themePrefix,

lib/tern/package.json

@@ -248,7 +248,7 @@
   },
   "homepage": "https://github.com/ternjs/tern#readme",
   "_id": "tern@0.16.1",
-  "_shasum": "1c5690edb7ae8a6639500ef84702a370308e34af",
+  "_shasum": "ca82304a3ac0a89f88769e01b8a10efe9fdfb7d3",
   "_from": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e",
   "_resolved": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e"
 }

lib/tern_from_ts/package.json

@@ -20,7 +20,7 @@
   "readme": "# tern_from_ts\n\nTern signatures extracted from typescript signatures.\n\nLicense: MIT\n\nSee also https://github.com/marijnh/tern and https://github.com/borisyankov/DefinitelyTyped\n",
   "readmeFilename": "README.md",
   "_id": "tern_from_ts@0.0.1",
-  "_shasum": "8f3b5dcda416f0ce0aa4f0d40e7b9e73486717a8",
+  "_shasum": "18540143e46c52ed10041cd6bbcc2b747836e4a4",
   "_from": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c",
   "_resolved": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c"
 }

node_modules/nak/package.json

@@ -52,7 +52,7 @@
   },
   "homepage": "https://github.com/gjtorikian/nak#readme",
   "_id": "nak@0.3.3",
-  "_shasum": "6415140a9c824fc5bb9d516a61ecfaa0a3d93062",
+  "_shasum": "d3123787b1d5969aa4d29989a2d4c7d654078167",
   "_from": "git+https://github.com/cloud9ide/nak.git#6deef931594",
   "_resolved": "git+https://github.com/cloud9ide/nak.git#6deef931594787edd167040f7352e3e7533430e4"
 }

node_modules/tern/package.json

@@ -248,7 +248,7 @@
   },
   "homepage": "https://github.com/ternjs/tern#readme",
   "_id": "tern@0.16.1",
-  "_shasum": "1c5690edb7ae8a6639500ef84702a370308e34af",
+  "_shasum": "ca82304a3ac0a89f88769e01b8a10efe9fdfb7d3",
   "_from": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e",
   "_resolved": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e"
 }

node_modules/tern_from_ts/package.json

@@ -20,7 +20,7 @@
   "readme": "# tern_from_ts\n\nTern signatures extracted from typescript signatures.\n\nLicense: MIT\n\nSee also https://github.com/marijnh/tern and https://github.com/borisyankov/DefinitelyTyped\n",
   "readmeFilename": "README.md",
   "_id": "tern_from_ts@0.0.1",
-  "_shasum": "8f3b5dcda416f0ce0aa4f0d40e7b9e73486717a8",
+  "_shasum": "18540143e46c52ed10041cd6bbcc2b747836e4a4",
   "_from": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c",
   "_resolved": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c"
 }

package.json

@@ -49,5 +49,5 @@
   },
   "devDependencies": {},
   "licenses": [],
-  "revision": "39c4749d120ac27de1cb1d9f1f9ffd5f77f7feae"
+  "revision": "22baba1e14c2a28aa5ad149a91aed72c0f65c58b"
 }

plugins/c9.ide.theme.jett/LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2018 Michael Jett
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

plugins/c9.ide.theme.jett/README.md

@@ -0,0 +1,73 @@
+# Cloud9 Jett Theme
+### A flat theme for C9 IDE
+
+Give your Cloud9 instance a modern look!
+
+<img src="screenshot.png" alt="screenshot" width="100%">
+
+## Features
+- Animations!
+- Retina ready!
+- Modern fonts!
+- Updated filetype icons!
+
+## Compatibility
+
+- Tested with C9 _v3.1.1022_
+- Latest version of Chrome, Safari, Firefox
+
+
+## Installation
+1. Git clone or download this repo into `c9sdk/plugins/c9.ide.theme.jett`
+2. Open `c9sdk/configs/client-default.js`. Before `return plugins;` add the following:
+
+    ```js
+    {
+       packagePath: "plugins/c9.ide.theme.jett/plugin",
+       staticPrefix: staticPrefix + "/plugins/c9.ide.theme.jett"
+    }
+    ```
+
+    > **Note**: This plugin styles collaborative features and has a hard set dependancy on `--collab` being enabled.
+
+3. Open `c9sdk/configs/standalone.js`. Add the following somewhere in the config:
+
+    ```js
+    {
+       packagePath: "./c9.ide.theme.jett/build-theme",
+       pathRoot: __dirname
+    }
+    ```
+
+4. Run cloud9 in `--collab` mode.
+
+    ```
+    node server.js -p 8081 -a : --collab
+    ```
+
+5. Upon launching your Cloud9 instance you should have a new color option in _Preferences > Themes > Flat Theme_. This will allow you switch this theme on/off.
+
+### Minification
+
+If you want to run cloud9 with minification turned on ( `--packed` mode ), you'll need to rebuild assets.
+
+  ```
+  scripts/makestandalone.sh --compress
+  ```
+
+### Customize CSS
+
+This is a little manual at the moment.
+
+1. Delete the current compilation. (`rm build/compile_jett.css`)
+2. Restart cloud9. The server-side plugin will detect the missing asset and rebuild it.
+
+## License
+- MIT
+
+## Contributing
+
+Please submit a pull request through github.
+
+## Author
+- GitHub: https://github.com/jumbojett/

plugins/c9.ide.theme.jett/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "",
+  "description": "",
+  "version": "0.0.1",
+  "author": "",
+  "contributors": [
+    {
+      "name": "",
+      "email": ""
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": ""
+  },
+  "plugins": {
+    "build-theme": {}
+  },
+  "categories": ["miscellaneous"],
+  "licenses": []
+}

plugins/c9.static/build.js

@@ -132,9 +132,15 @@ function main(options, imports, register) {
             compileLess: true,
             lessLibs: [
                 "plugins/c9.ide.layout.classic/less/lesshat.less",
+            ].concat(
+                color == "jett-dark" ? [
+                    "plugins/c9.ide.theme.jett/less/overrides.less",
+                    "plugins/c9.ide.theme.jett/less/variables.less"
+                ] : [
                     "plugins/c9.ide.layout.classic/themes/default-" + color + ".less",
                     "plugins/c9.ide.layout.classic/themes/" + color + ".less"
-            ],
+                ]
+            ),
             staticPrefix: "plugins/c9.ide.layout.classic",
             lessLibCacheKey: color,
             basepath: pathConfig.root,

plugins/c9.static/cdn.cli.js

@@ -45,7 +45,7 @@ define(function(require, exports, module) {
                     }
                     var skins = options.withSkins;
                     if (skins === true || skins === "all")
-                        skins = ["dark", "light", "dark-gray", "light-gray", "flat-light", "flat-dark"];
+                        skins = ["dark", "light", "dark-gray", "light-gray", "flat-light", "flat-dark", "jett-dark"];
                     else
                         skins = skins ? skins.split(/,\s*/) : [];
                     
@@ -172,6 +172,7 @@ define(function(require, exports, module) {
                 "plugins/c9.ide.ace.keymaps/vim/keymap",
                 "plugins/c9.ide.ace.keymaps/emacs/keymap",
                 "plugins/c9.ide.ace.keymaps/sublime/keymap",
+                "plugins/c9.ide.theme.jett/ace.themes/jett"
             ];
             
             // FIXME: this could be resolved via pathConfig:

plugins/node_modules/architect-build/build.js

@@ -247,7 +247,7 @@ function checkImages(css, opts, cache) {
     var file;
     var count = 0;
     var missingCount = 0;
-    css = css.replace(/(url\(['"]?)(?:\/static\/)?([^"')]+)|@file (\S+)/g, function(_, prefix, imagePath, fileId) {
+    css = css.replace(/(url\(['"]?)(?!https?:)(?:\/static\/)?([^"')]+)|@file (\S+)/g, function(_, prefix, imagePath, fileId) {
         if (fileId) {
             file = fileId;
             return _;

version

@@ -1 +1 @@
-1520308593
+1520394993