Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'devel' of github.com:ajaxorg/cloud9

  • Loading branch information...
commit 30b472a9ad6dc9ecae6f49849ff1b7571e1c0a9e 2 parents 06b2875 + dc4aabc
@fjakobs fjakobs authored
View
2  client/ext/console/console.js
@@ -55,7 +55,7 @@ return ext.register("ext/console/console", {
},
getCwd: function() {
- return this.$cwd.replace("/workspace", ide.workspaceDir.replace(/\/+$/, ""));
+ return this.$cwd && this.$cwd.replace("/workspace", ide.workspaceDir.replace(/\/+$/, ""));
},
logNodeStream : function(data, stream, workspaceDir, davPrefix, useOutput) {
View
23 client/ext/console/console.xml
@@ -4,7 +4,28 @@
<a:bar id="winDbgConsole" skin="basic" height="42">
<a:vbox height="{winDbgConsole.height}">
<a:tab id="tabConsole" skin="tab_console" flex="1" visible="false">
- <a:button skin="btn_icon_only" icon="console_max.png" top="4" right="5" />
+ <a:button skin="btn_icon_only" icon="console_max.png" top="4" right="5" state="true"
+ onprop.value = "
+ if (event.value) {
+ document.body.appendChild(winDbgConsole.$ext);
+ winDbgConsole.$ext.style.position = 'absolute';
+ winDbgConsole.$ext.style.left = 0;
+ winDbgConsole.$ext.style.top = 0;
+ winDbgConsole.$ext.style.right = 0;
+ winDbgConsole.$ext.style.bottom = 0;
+ winDbgConsole.$ext.style.width = 'auto';
+ winDbgConsole.lastHeight = winDbgConsole.height;
+ winDbgConsole.setAttribute('height', '100%');
+ winDbgConsole.$ext.style.zIndex = 9999;
+ }
+ else {
+ winDbgConsole.parentNode.$int.appendChild(winDbgConsole.$ext);
+ winDbgConsole.$ext.style.position = 'relative';
+ winDbgConsole.$ext.style.width = '1px';
+ winDbgConsole.setAttribute('height', winDbgConsole.lastHeight);
+ winDbgConsole.$ext.style.zIndex = 1;
+ }
+ "/>
<a:button skin="btn_icon_only" icon="console_clear.png" top="4" right="32"
onclick = "
if (tabConsole.activepagenr == 0)
View
3  client/ext/debugger/debugger.js
@@ -273,6 +273,9 @@ return ext.register("ext/debugger/debugger", {
},
disable : function(){
+ if (!this.panel)
+ return;
+
this.nodes.each(function(item){
if (item.hide)
item.hide();
View
2  client/index.html
@@ -27,7 +27,7 @@
var HOST = "http://dev1.ajax.org";
var TESTING = false; //Load data from test models
- var VERSION = RELEASE; //Change the version you want to use here
+ var VERSION = FILES; //Change the version you want to use here
var apfLoc = VERSION == FILES
? "support/apf/apf.js"
View
7 client/style/skins.xml
@@ -4958,6 +4958,7 @@
padding: 0;
position : relative;
vertical-align : bottom;
+ height : 18px;
}
.tab_console .btncontainer .btntab {
@@ -17767,12 +17768,16 @@
.wnscrollbar span{
left : 0;
}
+
+ .wnscrollbar .mainrail {
+ height : auto;
+ }
.wnscrollbar .filler{
left : 0;
height : auto;
top : 0;
- bottom : 8px;
+ bottom : 0;
}
</a:style>
Please sign in to comment.
Something went wrong with that request. Please try again.