diff --git a/LICENSE b/LICENSE index a58998035..23703a1dd 100644 --- a/LICENSE +++ b/LICENSE @@ -12,7 +12,7 @@ software and other kinds of works. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public Licensasdase is intended to guarantee your freedom to +the GNU General Public License is intended to guarantee your freedom to share and change all versions of asda program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to diff --git a/client/ext/all.js b/client/ext/all.js index 76f782e62..cea417af2 100644 --- a/client/ext/all.js +++ b/client/ext/all.js @@ -42,6 +42,7 @@ var extAll = define([ "ext/watcher/watcher", "ext/dragdrop/dragdrop", "ext/menus/menus", + "ext/tooltip/tooltip", "ext/sidebar/sidebar", "ext/beautify/beautify", "ext/offline/offline", diff --git a/client/ext/console/console.js b/client/ext/console/console.js index c7c367ddb..916e79134 100644 --- a/client/ext/console/console.js +++ b/client/ext/console/console.js @@ -399,10 +399,12 @@ module.exports = ext.register("ext/console/console", { stProcessRunning.addEventListener("activate", function() { var autoshow = settings.model.queryValue("auto/console/@autoshow"); - if (_self.autoOpen && apf.isTrue(autoshow)) - _self.show(); - - _self.showOutput(); + if (_self.autoOpen && apf.isTrue(autoshow)) { + setTimeout(function(){ + _self.show(); + _self.showOutput(); + }, 200); + } }); }, @@ -643,7 +645,7 @@ module.exports = ext.register("ext/console/console", { Firmin.animate(winDbgConsole.$ext, { height: height + "px", timingFunction: "cubic-bezier(.30, .08, 0, 1)" - }, 0.4, finish); + }, 0.3, finish); } else finish(); @@ -659,10 +661,15 @@ module.exports = ext.register("ext/console/console", { winDbgConsole.$ext.style.maxHeight = "10000px"; if (!immediate && animOn) { + var timer = setInterval(function(){apf.layout.forceResize()}, 10); + Firmin.animate(winDbgConsole.$ext, { height: height + "px", - timingFunction: "cubic-bezier(.63, .26, .82, .58)" - }, 0.3, finish); + timingFunction: "ease-in-out" + }, 0.3, function(){ + clearInterval(timer); + finish(); + }); } else finish(); diff --git a/client/ext/editors/editors.js b/client/ext/editors/editors.js index 1562b12c1..52f39d13b 100644 --- a/client/ext/editors/editors.js +++ b/client/ext/editors/editors.js @@ -325,7 +325,7 @@ module.exports = ext.register("ext/editors/editors", { "step" + Math.ceil((dir ? --i : ++i) / div), ["step" + Math.ceil((dir ? i + 1 : i-1) / div)]); - if (!dir && tabEditors.getPage()) + if (tabEditors.getPage()) apf.layout.forceResize(tabEditors.getPage().$ext); }, onfinish : function(e){ diff --git a/client/ext/main/style/skins.xml b/client/ext/main/style/skins.xml index d822e8a4e..94c362c2d 100755 --- a/client/ext/main/style/skins.xml +++ b/client/ext/main/style/skins.xml @@ -5303,6 +5303,22 @@ background-repeat: no-repeat; background-position: 0 -16px; } + + .menu-bk.c9-tooltip { + padding : 7px 7px 8px 10px; + line-height : 15px; + width : 250px; + color : #f1f1f1; + } + + .menu-bk.c9-tooltip a, .menu-bk.c9-tooltip span{ + color: #91c478; + } + + .menu-bk.c9-tooltip .arrow{ + left : 50%; + margin-left : -12px; + } ]]> diff --git a/client/ext/revisions/revisions.js b/client/ext/revisions/revisions.js index 27f080e84..871b61ca1 100644 --- a/client/ext/revisions/revisions.js +++ b/client/ext/revisions/revisions.js @@ -11,6 +11,7 @@ var ide = require("core/ide"); var ext = require("core/ext"); var editors = require("ext/editors/editors"); var menus = require("ext/menus/menus"); +var tooltip = require("ext/tooltip/tooltip"); var commands = require("ext/commands/commands"); //var TreeDocument = require("concorde/AceDocument"); @@ -130,33 +131,13 @@ module.exports = ext.register("ext/revisions/revisions", { btnSave.setAttribute("margin", "0 20 0 20"); btnSave.removeAttribute("command"); - btnSave.addEventListener("onmouseover", function(e) { - setTimeout(function (e) { - ext.initExtension(self); - revisionsInfo.addEventListener("onmouseover", function(e) { - isInfoActive = true; - }); - revisionsInfo.addEventListener("onmouseout", function(e) { - isInfoActive = false; - self.hideRevisionsInfo(); - }); - apf.tween.single(revisionsInfo, { - from:0, - to:1, - steps: 10, - type : "opacity", - anim : apf.tween.easeInOutCubic, - interval: 30 - }); - }, 500); - }); - - btnSave.addEventListener("onmouseout", function(e) { - self.hideRevisionsInfo(); - }); - - btnSave.addEventListener("onclick", function(e) { - Save.quicksave(); + tooltip.add(btnSave, { + message : "Changes to your file are automatically saved.
\ + View all your changes through the Revision History pane. \ + Rollback to a previous state, or make comparisons.", + width : "250px" }); // Declaration of event listeners @@ -833,14 +814,6 @@ module.exports = ext.register("ext/revisions/revisions", { ); }, - toggleInfoDiv : function(show) { - ext.initExtension(this); - if (show === true) - revisionsInfo.$ext.style.display = "block"; - else - revisionsInfo.$ext.style.display = "none"; - }, - /** * Revisions#generateTimestamps(page) * - revObj(Object): Body of the message coming from the server diff --git a/client/ext/revisions/revisions.xml b/client/ext/revisions/revisions.xml index 678bbc3be..3f6734f5c 100644 --- a/client/ext/revisions/revisions.xml +++ b/client/ext/revisions/revisions.xml @@ -107,15 +107,4 @@ " /> - - - -
- - Changes to your file are automatically saved. - <br/> - View all your changes through the Revision History pane. Rollback to a previous state, or make comparisons. - - - diff --git a/client/ext/runpanel/runpanel.js b/client/ext/runpanel/runpanel.js index 45c31c84f..08c5c3527 100644 --- a/client/ext/runpanel/runpanel.js +++ b/client/ext/runpanel/runpanel.js @@ -13,6 +13,7 @@ var noderunner = require("ext/noderunner/noderunner"); var panels = require("ext/panels/panels"); var settings = require("ext/settings/settings"); var menus = require("ext/menus/menus"); +var tooltip = require("ext/tooltip/tooltip"); var dock = require("ext/dockpanel/dockpanel"); var save = require("ext/save/save"); var markup = require("text!ext/runpanel/runpanel.xml"); @@ -114,28 +115,13 @@ module.exports = ext.register("ext/runpanel/runpanel", { this.model = new apf.model().load("") ); - btnRun.$button1.addEventListener("onmouseover", function(e) { - setTimeout(function(e) { - ext.initExtension(_self); - apf.tween.single(debugInfo, { - from:0, - to:1, - steps: 10, - type:"fade", - interval: 30 - }); - }, 500); - }); - - btnRun.$button1.addEventListener("onmouseout", function(e) { - ext.initExtension(_self); - apf.tween.single(debugInfo, { - from:1, - to:0, - steps: 10, - type:"fade", - interval: 30 - }); + tooltip.add( btnRun.$button1, { + message : "Run & Debug your Node.js applications.\ + For more help, check out our guided tour in the Help menu.\ + Want your language supported? Tweet us \ + @Cloud9IDE!", + width : "203px", + timeout : 1000 }); var c = 0; diff --git a/client/ext/runpanel/runpanel.xml b/client/ext/runpanel/runpanel.xml index df5e8910d..cee747fe3 100644 --- a/client/ext/runpanel/runpanel.xml +++ b/client/ext/runpanel/runpanel.xml @@ -118,14 +118,4 @@ - - - -
- - Run & Debug your Node.js applications. - <br/>For help running code, check out our guided tour in the Help menu. - <br/>Want your language supported?<br/>Tweet us @Cloud9IDE! - - \ No newline at end of file diff --git a/client/js/apf_release.js b/client/js/apf_release.js index 986bb200a..a620a92a6 100644 --- a/client/js/apf_release.js +++ b/client/js/apf_release.js @@ -3,7 +3,7 @@ -/*FILEHEAD(apf.js)SIZE(96190)TIME(Sat, 28 Apr 2012 17:52:39 GMT)*/ +/*FILEHEAD(apf.js)SIZE(96350)TIME(Mon, 30 Apr 2012 22:00:16 GMT)*/ /* * See the NOTICE file distributed with this work for additional @@ -414,6 +414,7 @@ VERSION:'3.0beta', apf.hasContentEditableContainerBug = apf.isWebkit; // Try transform first for forward compatibility var props = ["transform", "OTransform", "KhtmlTransform", "MozTransform", "WebkitTransform"], + props2 = ["transition", "OTransition", "KhtmlTransition", "MozTransition", "WebkitTransition"], prefixR = ["", "O", "Khtml", "Moz", "Webkit"], prefixC = ["", "o-", "khtml-", "moz-", "webkit-"], events = ["transitionend", "transitionend", "transitionend", "transitionend", "webkitTransitionEnd"], @@ -424,6 +425,7 @@ VERSION:'3.0beta', for (; i < l && !this.supportCSSAnim; ++i) { if (typeof t.style[props[i]] == "undefined") continue; this.supportCSSAnim = props[i]; + this.supportCSSTransition = props2[i]; this.runtimeStylePrefix = prefixR[i]; this.classNamePrefix = prefixC[i]; this.cssAnimEvent = events[i]; @@ -11429,7 +11431,7 @@ apf.Sort = function(xmlNode){ -/*FILEHEAD(core/lib/tween.js)SIZE(35723)TIME(Sat, 28 Apr 2012 21:06:18 GMT)*/ +/*FILEHEAD(core/lib/tween.js)SIZE(35741)TIME(Mon, 30 Apr 2012 22:55:42 GMT)*/ /* * See the NOTICE file distributed with this work for additional @@ -11780,7 +11782,7 @@ var ID = "id", oHtml.style.position = "relative"; } catch(e){} - var useCSSAnim = (apf.supportCSSAnim && apf.supportCSSTransition && CSSPROPS[info.type]), + var useCSSAnim = (false && apf.supportCSSAnim && apf.supportCSSTransition && CSSPROPS[info.type]), isTransform = (info.type == TRANSFORM); info.method = useCSSAnim ? info.type : isTransform @@ -11937,7 +11939,7 @@ var ID = "id", } var animCSS, isTransform, - useCSSAnim = apf.supportCSSAnim && apf.supportCSSTransition, + useCSSAnim = false && apf.supportCSSAnim && apf.supportCSSTransition, hasCSSAnims = false, cssDuration = ((info.steps * info.interval) / 1000), cssAnim = CSSTIMING[info.anim || 0],