Moved commit to a panel and tweaks to single line ace

configs/client-default.js

@@ -808,11 +808,9 @@ module.exports = function(options) {
         
         // git integration
         "plugins/c9.ide.scm/scm",
-        "plugins/c9.ide.scm/scm.button",
-        // "plugins/c9.ide.scm/scm.commit",
+        "plugins/c9.ide.scm/scm.commit",
         "plugins/c9.ide.scm/scm.branches",
         "plugins/c9.ide.scm/dialog.localchanges",
-        "plugins/c9.ide.scm/dialog.commit",
         "plugins/c9.ide.scm/scm.log",
         "plugins/c9.ide.scm/scmpanel",
         "plugins/c9.ide.scm/detail",

package.json

@@ -109,9 +109,9 @@
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#9956689819",
         "c9.ide.save": "#4cda35bfdb",
-        "c9.ide.scm": "#aa289fd6bf",
+        "c9.ide.scm": "#31c730a295",
         "c9.ide.terminal.monitor": "#1a4092ede2",
-        "c9.ide.test": "#8905405655",
+        "c9.ide.test": "#102942ae4e",
         "c9.ide.test.mocha": "#fc053b23d2",
         "c9.ide.theme.flat": "#81dadeee55",
         "c9.ide.threewaymerge": "#229382aa0b",

plugins/c9.ide.layout.classic/less/codebox.less

@@ -70,9 +70,8 @@
 .tb_console.tb_textboxInitial .input {
     font-size : 10px;
 }
-
-.tb_console.tb_textboxInitial .ace_cursor{
-    display : none;
+.tb_console.tb_textboxInitial .ace_scroller {
+    text-indent: 2px;
 }
 
 .tb_consoleDisabled .sbtb_middle {

plugins/c9.ide.layout.classic/themes/default-flat-light.less

@@ -1706,7 +1706,7 @@
 @diff-toolbar-buttons-background: #F9F9F9;
 @diff-toolbar-buttons-border: 1px solid @border-highlight-dark;
 
-@form-bar-padding: 10px 10px 10px 10px;
+@form-bar-padding: 10px 10px 0 10px;
 @form-bar-background: @menu-button-active-background;
 @form-bar-border-bottom: 1px solid #DEDEDE;
 @form-bar-box-shadow: 0 1px @border-highlight;

plugins/c9.ide.ui/codebox.js

@@ -87,28 +87,25 @@ apf.codebox = function(struct, tagName) {
         this.$editor = this.ace = ace;
         ace.renderer.setPadding(2);
         this.ace.codebox = this;
-
-        ace.on("focus", function() {
-            dom.removeCssClass(ace.codebox.$ext, "tb_textboxInitial");
-
-            if (ace.renderer.initialMessageNode) {
+        
+        var checkInitial = function() {
+            var value = ace.getValue();
+            if (value && ace.renderer.initialMessageNode) {
+                dom.removeCssClass(ace.codebox.$ext, "tb_textboxInitial");
                 ace.renderer.scroller.removeChild(ace.renderer.initialMessageNode);
                 ace.renderer.initialMessageNode = null;
             }
-        });
+            else if (!value && !ace.renderer.initialMessageNode) {
+                dom.addCssClass(ace.codebox.$ext, "tb_textboxInitial");
+                ace.renderer.initialMessageNode = document.createTextNode(ace.codebox["initial-message"] || "");
+                ace.renderer.scroller.appendChild(ace.renderer.initialMessageNode);
+            }
+            
+        };
+        ace.on("input", checkInitial);
 
-        function onBlur() {
-            if (ace.$isFocused || ace.session.getValue())
-                return;
-            dom.addCssClass(ace.codebox.$ext, "tb_textboxInitial");
-
-            if (ace.renderer.initialMessageNode)
-                return;
-            ace.renderer.initialMessageNode = document.createTextNode(ace.codebox["initial-message"] || "");
-            ace.renderer.scroller.appendChild(ace.renderer.initialMessageNode);
-        }
-        ace.on("blur", onBlur);
-        setTimeout(onBlur, 100);
+        setTimeout(checkInitial, 100);
+        
         // todo should we do this here?
         // ace.on("resize", function(){apf.layout.forceResize();});
         
@@ -181,6 +178,7 @@ apf.codebox = function(struct, tagName) {
         new MultiSelect(editor);
         editor.session.setUndoManager(new UndoManager());
 
+        editor.setOption("indentedSoftWrap", false);
         editor.setHighlightActiveLine(false);
         editor.setShowPrintMargin(false);
         editor.renderer.setShowGutter(false);