Skip to content
Browse files

Merge branch 'master' into better-mixed-modes

Conflicts:
	plugins-client/lib.apf/www/apf-packaged/apf_release.js
  • Loading branch information...
2 parents 3078b44 + 7ba14d1 commit 6c625fee19495b7c5b4893eb41ed731c6cdf8d2b Mostafa Eweda committed Nov 28, 2012
View
2 package.json
@@ -45,7 +45,7 @@
"mappings": {
"ace": ["npm", "https://github.com/ajaxorg/ace/tarball/cc2a2c9e056c6d4049f8849ec3ad72974de37177"],
- "apf": ["npm", "https://github.com/ajaxorg/apf/tarball/2d17e74d9457dd841112532c1ea8d84eb82bee31"],
+ "apf": ["npm", "https://github.com/ajaxorg/apf/tarball/145f65bd24ae83f041418dd01a9c51d278045f3f"],
"asyncjs": ["npm", "https://github.com/ajaxorg/async.js/tarball/0b4ed5608a32c280a7690b5f52883d8d1fc0de08"],
"v8debug": ["npm", "https://github.com/ajaxorg/lib-v8debug/tarball/d2fac9b09724cb2e75e2807191eace9bc27d3b52"],
"packager": ["npm", "https://github.com/ajaxorg/packager/tarball/bee2a82c6d5e2875024bfdc83937e98092ccf04f"],
View
19 plugins-client/ext.main/style/skins.xml
@@ -54,6 +54,14 @@
.fakehbox.static{
position : static;
}
+
+ .bar-offline-cover {
+ position: absolute;
+ top: 0;
+ right: 0;
+ left: 0;
+ bottom: 0;
+ }
]]></a:style>
<a:presentation>
@@ -256,6 +264,11 @@
.c9-menu-bar .c9-mbar-bcont .c9-mbar-minimize:hover {
background-position: -21px -70px;
}
+
+ .c9-menu-bar .c9-mbar-bcont .c9-simple-btnDisabled.c9-mbar-minimize:hover {
+ background-position: 0 -70px;
+ cursor: default;
+ }
.c9-mbar-round {
background : url(images/c9-no-repeat.png) no-repeat 0 0;
height: 37px;
@@ -1692,6 +1705,10 @@
height : 25px;
margin: 0 !important;
}
+
+ .c9-menu-btnDisabled.c9-menu-btn .c9-label {
+ color: #999;
+ }
]]></a:style>
<a:presentation>
@@ -12921,7 +12938,7 @@
.ace_one-line .ace_cursor {
border-left-width: 1px;
}
- .ace_one-line .ace_hidden-cursors {
+ .ace_one-line .ace_cursor.ace_hidden {
opacity: 0;
}
.ace_one-line .ace_scroller {
View
22 plugins-client/ext.offline/offline.js
@@ -8,22 +8,29 @@ define(function(require, exports, module) {
var ide = require("core/ide");
var ext = require("core/ext");
var Offline = require("ext/offline/lib-offline");
-var markup = require("text!ext/offline/skin.xml");
+var markup = require("text!ext/offline/offline.xml");
+var css = require("text!ext/offline/style.css");
module.exports = ext.register("ext/offline/offline", {
dev : "Ajax.org",
name : "Offline",
alone : true,
type : ext.GENERAL,
markup : markup,
-
+ css : css,
offlineStartup : 0,
/**
* Init method to create the offline logic
*/
init : function(){
+ apf.importCssString(this.css || "");
+
var _self = this;
+ var barCover = barOfflineCover;
+ tabEditors.appendChild(barCover);
+ barCover.parentNode.removeNode(barCover)
+
var offline = this.offline = new Offline("cloud9", (window.location.pathname + "/$reconnect").replace(/\/\//g, "/"));
// preload the offline images programmatically:
@@ -49,8 +56,13 @@ module.exports = ext.register("ext/offline/offline", {
if (ide.local)
offlineNotifyDialog.show();
-
+
_self.bringExtensionsOffline();
+
+ if (!window.barOfflineCover)
+ tabEditors.appendChild(barOfflineCover);
+
+ barOfflineCover.show();
});
// make sure that ide.onLine is actual 1 here already
@@ -69,6 +81,8 @@ module.exports = ext.register("ext/offline/offline", {
if (ide.local)
offlineNotifyDialog.hide();
+ if (window.barOfflineCover)
+ barOfflineCover.hide();
});
ide.addEventListener("localOffline", function(e) {
@@ -89,7 +103,7 @@ module.exports = ext.register("ext/offline/offline", {
if (this.offlineStartup)
ide.dispatchEvent("afteroffline"); // Faking offline startup
-
+
// We may miss the first socketConnect event
if (ide.connected)
offline.goOnline();
View
7 plugins-client/ext.offline/skin.xml → plugins-client/ext.offline/offline.xml
@@ -1,4 +1,4 @@
-<a:application xmlns:a="http://ajax.org/2005/aml">
+<a:application xmlns:a="http://ajax.org/2005/aml">
<a:window id = "offlineNotifyDialog"
title = "No Local Runtime"
center = "true"
@@ -18,4 +18,9 @@
</a:text>
</a:vbox>
</a:window>
+
+ <a:bar id="barOfflineCover" class="bar-offline-cover" visible="false" zindex="100">
+ <div class="offline-cover"></div>
+ <div class="offline-indicator">Connection is lost! Trying to reach c9.io...</div>
+ </a:bar>
</a:application>
View
38 plugins-client/ext.offline/style.css
@@ -0,0 +1,38 @@
+.offline-indicator {
+ background-image: linear-gradient(bottom, rgb(248,216,170) 0%, rgb(250,227,193) 100%);
+ background-image: -o-linear-gradient(bottom, rgb(248,216,170) 0%, rgb(250,227,193) 100%);
+ background-image: -moz-linear-gradient(bottom, rgb(248,216,170) 0%, rgb(250,227,193) 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb(248,216,170) 0%, rgb(250,227,193) 100%);
+ background-image: -ms-linear-gradient(bottom, rgb(248,216,170) 0%, rgb(250,227,193) 100%);
+
+ -moz-border-radius : 0 0 6px 6px;
+ -webkit-border-radius : 0 0 6px 6px;
+ border-radius : 0 0 6px 6px;
+
+ color: #956726;
+ text-shadow: #fff4e4 0px 1px 0px;
+
+ border: 2px solid #fff;
+ border-top-width: 1px;
+
+ width: 235px;
+ padding: 5px 8px 6px;
+ margin: 0 auto;
+ position: relative;
+ z-index: 1;
+
+ -webkit-box-shadow: 0px 3px 2px 0px rgba(0, 0, 0, 0.15);
+ box-shadow: 0px 3px 2px 0px rgba(0, 0, 0, 0.15);
+
+ text-align: center;
+}
+.offline-cover {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: #fff;
+ opacity: 0.4;
+ z-index: 0;
+}
View
81,120 plugins-client/lib.apf/www/apf-packaged/apf_release.js
40,560 additions, 40,560 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
11 plugins-server/cloud9.core/view/ide.tmpl.html
@@ -54,7 +54,7 @@
loadingIde.appendChild(header);
loadingIde.appendChild(content);
loadingIde.appendChild(footer);
- document.body.appendChild(loadingIde);
+ document.documentElement.appendChild(loadingIde);
var dots = document.getElementById("dots");
var cnt = 0;
@@ -68,14 +68,9 @@
var loadingDiv = document.getElementById("loadingide");
if (loadingDiv)
- document.body.removeChild(loadingDiv);
+ document.documentElement.removeChild(loadingDiv);
}
- var createSplashInterval = setInterval(function() {
- if (document.body) {
- createSplash();
- clearInterval(createSplashInterval);
- }
- }, 10);
+ createSplash();
</script>
<link rel="stylesheet" type="text/css" href="[%staticUrl%]/ext/main/style/style.css" />

0 comments on commit 6c625fe

Please sign in to comment.
Something went wrong with that request. Please try again.