Merge remote-tracking branch 'origin/master' into coreflows-per-pr-fixes

Conflicts:
	plugins/c9.docker/d9/_helpers.sh

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.575",
+    "version": "3.1.593",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -66,7 +66,7 @@
         "c9.ide.language.javascript.tern": "#d8f3df1b39",
         "c9.ide.language.javascript.infer": "#8478e3c702",
         "c9.ide.language.jsonalyzer": "#45453961d9",
-        "c9.ide.collab": "#5d9400830d",
+        "c9.ide.collab": "#30efed939e",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c3bf17286d",

plugins/c9.ide.server/views/classic-load-screen.html

@@ -0,0 +1,36 @@
+<link rel="stylesheet" type="text/css" href="<%=staticPrefix%>/plugins/c9.ide.layout.classic/loading.css" />
+<div id="loadingide">
+    <div id="header"></div>
+    <div id="content" class="loading-progress">
+        <div id="progress-msg">
+            Loading your workspace <span id="dots"></span>
+        </div>
+        <div class="loading-seperator" id="loading-seperator"></div>
+        <div class="loading-msg" id="loading-msg">It will be just as you left it</div>
+        
+        <div class="ui-progress-bar ui-container" id="progress_bar">
+            <div class="ui-progress" style="width: 7%;">
+              <span class="ui-label" style="display:none;"></span>
+            </div>
+        </div>
+    </div>
+    <div class="footer">
+        <a href="https://docs.c9.io">Documentation</a> | 
+        <a href="http://status.c9.io">Server Status</a> | 
+        <a href="http://support.c9.io">Support</a>
+    </div>
+</div>
+<script type="text/javascript">
+    var dots = document.getElementById("dots");
+    var cnt  = 0;
+    window.dotsAnim = setInterval(function () {
+        dots.textContent = "...".slice(0, (++cnt)%4);
+    }, 500);
+    
+    window.hideLoader = function(){
+        var loader = document.getElementById("loadingide");
+        loader.parentNode.removeChild(loader);
+        
+        clearInterval(window.dotsAnim);
+    };
+</script>

plugins/c9.ide.server/views/flat-load-screen.html

@@ -0,0 +1,57 @@
+<link rel="stylesheet" type="text/css" href="<%=staticPrefix%>/plugins/c9.ide.layout.classic/loading-flat.css" />
+<div id="loadingide" class="<%-: theme + (isDark ? " dark" : "") %>">
+    <div class="cool-message"></div>
+    <div class="status" style="display:none"><div class="spinner"></div></div>
+    
+    <div id="content" class="loading-progress">
+    </div>
+    <div class="footer">
+        <a href="https://docs.c9.io">Documentation</a> | 
+        <a href="http://status.c9.io">Server Status</a> | 
+        <a href="http://support.c9.io">Support</a>
+    </div>
+</div>
+<script>
+    var loadingIde = document.querySelector("#loadingide");
+    document.body.className = "loading " + loadingIde.className;
+
+    var messages = [
+        "It's better up here.",
+        "Happy coding!",
+        "Everything as you left it.",
+        "Give some love to your colleague on the left!",
+        "Thank you Ada Lovelace!",
+        "Feel the power of a full IDE &mdash; in the cloud.",
+        "Code for the cloud, in the cloud",
+        "Out with the old, in with the new",
+        "POST /desktop/era",
+        "#OnCloud9",
+        "I &#10084; Cloud9",
+        "My life. My code. My Cloud9.",
+        "For the love of code",
+        "Get Your Code On",
+        "Skip the hazing, love the coding",
+        "Stop cursing, start coding",
+        "GET /this/workspace#loaded",
+        "Use our Vim mode for extra addictive effect!",
+        "Not your grandfather's IDE",
+        "Now made with 20% more cloud!",
+    ];
+    
+    var idx = Math.floor(Math.random() * messages.length);
+    if (idx == messages.length) idx = messages.length - 1;
+    document.querySelector("#loadingide .cool-message").innerHTML =
+        messages[idx];
+
+    setTimeout(function(){
+        var s = document.querySelector("#loadingide .status");
+        if (s) s.style.display = "block";
+    }, 2000);
+    
+    window.hideLoader = function(){
+        var loader = document.getElementById("loadingide");
+        loader.parentNode.removeChild(loader);
+        
+        document.body.className = document.body.className.replace("loading " + loadingIde.className, "");
+    }
+</script>

plugins/c9.ide.server/views/load-screen.ejs

@@ -0,0 +1,28 @@
+<%
+    var plugins = architectConfig;
+    var theme = "flat-light", html;
+    plugins.some(function(n){ 
+        if (n.packagePath == "plugins/c9.core/settings") {
+            if (n.html) html = n.html;
+            
+            try { var settings = JSON.parse(n.settings.user); }
+            catch(e) { return; }
+            
+            theme = settings.general && settings.general["@skin"] || "";
+            if (typeof theme != "string") theme = "";
+            
+            return true;
+        }
+    });
+    
+    var isDark = theme.indexOf("dark") > -1;
+    if (!html) {
+        var isFlat = theme.indexOf("flat") > -1;
+        %><% include flat-load-screen.html %><%
+    }
+    else {
+        %><div id="loadingide" class="<%-: theme + (isDark ? " dark" : "") %>">
+            <%-: html %>
+        </div><%
+    }
+%>

plugins/c9.ide.ui/lib_apf.js

@@ -35299,8 +35299,8 @@ apf.textbox = function(struct, tagName) {
         var v;
         
         if (this.isHTMLBox) { 
-            if (this.$input.innerText)
-                v = this.$input.innerText;
+            if (this.$input.textContent)
+                v = this.$input.textContent;
             else {
                 //Chrome has a bug, innerText is cleared when display property is changed
                 v = apf.html_entity_decode(this.$input.innerHTML