Skip to content

Commit fff71f7

Browse files
author
Ruben Daniels
committed
* Fixed annoying tooltips
* Tweaked console anim some more
1 parent 062f60f commit fff71f7

File tree

10 files changed

+55
-91
lines changed

10 files changed

+55
-91
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ software and other kinds of works.
1212

1313
The licenses for most software and other practical works are designed
1414
to take away your freedom to share and change the works. By contrast,
15-
the GNU General Public Licensasdase is intended to guarantee your freedom to
15+
the GNU General Public License is intended to guarantee your freedom to
1616
share and change all versions of asda program--to make sure it remains free
1717
software for all its users. We, the Free Software Foundation, use the
1818
GNU General Public License for most of our software; it applies also to

client/ext/all.js

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ var extAll = define([
4242
"ext/watcher/watcher",
4343
"ext/dragdrop/dragdrop",
4444
"ext/menus/menus",
45+
"ext/tooltip/tooltip",
4546
"ext/sidebar/sidebar",
4647
"ext/beautify/beautify",
4748
"ext/offline/offline",

client/ext/console/console.js

+14-7
Original file line numberDiff line numberDiff line change
@@ -399,10 +399,12 @@ module.exports = ext.register("ext/console/console", {
399399

400400
stProcessRunning.addEventListener("activate", function() {
401401
var autoshow = settings.model.queryValue("auto/console/@autoshow");
402-
if (_self.autoOpen && apf.isTrue(autoshow))
403-
_self.show();
404-
405-
_self.showOutput();
402+
if (_self.autoOpen && apf.isTrue(autoshow)) {
403+
setTimeout(function(){
404+
_self.show();
405+
_self.showOutput();
406+
}, 200);
407+
}
406408
});
407409
},
408410

@@ -643,7 +645,7 @@ module.exports = ext.register("ext/console/console", {
643645
Firmin.animate(winDbgConsole.$ext, {
644646
height: height + "px",
645647
timingFunction: "cubic-bezier(.30, .08, 0, 1)"
646-
}, 0.4, finish);
648+
}, 0.3, finish);
647649
}
648650
else
649651
finish();
@@ -659,10 +661,15 @@ module.exports = ext.register("ext/console/console", {
659661
winDbgConsole.$ext.style.maxHeight = "10000px";
660662

661663
if (!immediate && animOn) {
664+
var timer = setInterval(function(){apf.layout.forceResize()}, 10);
665+
662666
Firmin.animate(winDbgConsole.$ext, {
663667
height: height + "px",
664-
timingFunction: "cubic-bezier(.63, .26, .82, .58)"
665-
}, 0.3, finish);
668+
timingFunction: "ease-in-out"
669+
}, 0.3, function(){
670+
clearInterval(timer);
671+
finish();
672+
});
666673
}
667674
else
668675
finish();

client/ext/editors/editors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ module.exports = ext.register("ext/editors/editors", {
325325
"step" + Math.ceil((dir ? --i : ++i) / div),
326326
["step" + Math.ceil((dir ? i + 1 : i-1) / div)]);
327327

328-
if (!dir && tabEditors.getPage())
328+
if (tabEditors.getPage())
329329
apf.layout.forceResize(tabEditors.getPage().$ext);
330330
},
331331
onfinish : function(e){

client/ext/main/style/skins.xml

+16
Original file line numberDiff line numberDiff line change
@@ -5303,6 +5303,22 @@
53035303
background-repeat: no-repeat;
53045304
background-position: 0 -16px;
53055305
}
5306+
5307+
.menu-bk.c9-tooltip {
5308+
padding : 7px 7px 8px 10px;
5309+
line-height : 15px;
5310+
width : 250px;
5311+
color : #f1f1f1;
5312+
}
5313+
5314+
.menu-bk.c9-tooltip a, .menu-bk.c9-tooltip span{
5315+
color: #91c478;
5316+
}
5317+
5318+
.menu-bk.c9-tooltip .arrow{
5319+
left : 50%;
5320+
margin-left : -12px;
5321+
}
53065322
]]></a:style>
53075323

53085324
<a:presentation>

client/ext/revisions/revisions.js

+8-35
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ var ide = require("core/ide");
1111
var ext = require("core/ext");
1212
var editors = require("ext/editors/editors");
1313
var menus = require("ext/menus/menus");
14+
var tooltip = require("ext/tooltip/tooltip");
1415
var commands = require("ext/commands/commands");
1516

1617
//var TreeDocument = require("concorde/AceDocument");
@@ -130,33 +131,13 @@ module.exports = ext.register("ext/revisions/revisions", {
130131
btnSave.setAttribute("margin", "0 20 0 20");
131132
btnSave.removeAttribute("command");
132133

133-
btnSave.addEventListener("onmouseover", function(e) {
134-
setTimeout(function (e) {
135-
ext.initExtension(self);
136-
revisionsInfo.addEventListener("onmouseover", function(e) {
137-
isInfoActive = true;
138-
});
139-
revisionsInfo.addEventListener("onmouseout", function(e) {
140-
isInfoActive = false;
141-
self.hideRevisionsInfo();
142-
});
143-
apf.tween.single(revisionsInfo, {
144-
from:0,
145-
to:1,
146-
steps: 10,
147-
type : "opacity",
148-
anim : apf.tween.easeInOutCubic,
149-
interval: 30
150-
});
151-
}, 500);
152-
});
153-
154-
btnSave.addEventListener("onmouseout", function(e) {
155-
self.hideRevisionsInfo();
156-
});
157-
158-
btnSave.addEventListener("onclick", function(e) {
159-
Save.quicksave();
134+
tooltip.add(btnSave, {
135+
message : "Changes to your file are automatically saved.<br />\
136+
View all your changes through <a href='javascript:void(0)' \
137+
onclick='require(\"ext/revisions/revisions\").toggle();' \
138+
class='revisionsInfoLink'>the Revision History pane</a>. \
139+
Rollback to a previous state, or make comparisons.",
140+
width : "250px"
160141
});
161142

162143
// Declaration of event listeners
@@ -833,14 +814,6 @@ module.exports = ext.register("ext/revisions/revisions", {
833814
);
834815
},
835816

836-
toggleInfoDiv : function(show) {
837-
ext.initExtension(this);
838-
if (show === true)
839-
revisionsInfo.$ext.style.display = "block";
840-
else
841-
revisionsInfo.$ext.style.display = "none";
842-
},
843-
844817
/**
845818
* Revisions#generateTimestamps(page)
846819
* - revObj(Object): Body of the message coming from the server

client/ext/revisions/revisions.xml

-11
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,4 @@
107107
" />
108108
</a:hbox>
109109
</a:vbox>
110-
111-
<a:bar id="revisionsInfo" class="c9-revisionsInfo menu-bk downward menu-bkFocus">
112-
<a:vbox class="revisionsInfoContainer">
113-
<div class="arrow revisionsInfoArrow"></div>
114-
<a:text id="revisionsInfoText" class="revisionsInfoDesc">
115-
Changes to your file are automatically saved.
116-
&lt;br/>
117-
View all your changes through <a href="javascript:void(0)" onclick="require('ext/revisions/revisions').toggle();" class="revisionsInfoLink">the Revision History pane</a>. Rollback to a previous state, or make comparisons.
118-
</a:text>
119-
</a:vbox>
120-
</a:bar>
121110
</a:application>

client/ext/runpanel/runpanel.js

+8-22
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var noderunner = require("ext/noderunner/noderunner");
1313
var panels = require("ext/panels/panels");
1414
var settings = require("ext/settings/settings");
1515
var menus = require("ext/menus/menus");
16+
var tooltip = require("ext/tooltip/tooltip");
1617
var dock = require("ext/dockpanel/dockpanel");
1718
var save = require("ext/save/save");
1819
var markup = require("text!ext/runpanel/runpanel.xml");
@@ -114,28 +115,13 @@ module.exports = ext.register("ext/runpanel/runpanel", {
114115
this.model = new apf.model().load("<configurations />")
115116
);
116117

117-
btnRun.$button1.addEventListener("onmouseover", function(e) {
118-
setTimeout(function(e) {
119-
ext.initExtension(_self);
120-
apf.tween.single(debugInfo, {
121-
from:0,
122-
to:1,
123-
steps: 10,
124-
type:"fade",
125-
interval: 30
126-
});
127-
}, 500);
128-
});
129-
130-
btnRun.$button1.addEventListener("onmouseout", function(e) {
131-
ext.initExtension(_self);
132-
apf.tween.single(debugInfo, {
133-
from:1,
134-
to:0,
135-
steps: 10,
136-
type:"fade",
137-
interval: 30
138-
});
118+
tooltip.add( btnRun.$button1, {
119+
message : "Run &amp; Debug your <span>Node.js</span> applications.\
120+
For more help, check out our guided tour in the Help menu.\
121+
Want your language supported? Tweet us \
122+
<a href='http://twitter.com/Cloud9IDE' target='_blank'>@Cloud9IDE</a>!",
123+
width : "203px",
124+
timeout : 1000
139125
});
140126

141127
var c = 0;

client/ext/runpanel/runpanel.xml

-10
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,4 @@
118118
</a:bar>
119119
</a:vbox>
120120
</a:window>
121-
122-
<a:bar id="debugInfo" class="c9-debugInfo menu-bk downward menu-bkFocus">
123-
<a:vbox class="debugInfoContainer">
124-
<div class="arrow debugInfoArrow"></div>
125-
<a:text id="debugInfoText" class="debugInfoDesc">
126-
Run &amp; Debug your Node.js applications.
127-
&lt;br/>For help running code, check out our guided tour in the Help menu.
128-
&lt;br/>Want your language supported?&lt;br/>Tweet us @Cloud9IDE!</a:text>
129-
</a:vbox>
130-
</a:bar>
131121
</a:application>

client/js/apf_release.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55

6-
/*FILEHEAD(apf.js)SIZE(96190)TIME(Sat, 28 Apr 2012 17:52:39 GMT)*/
6+
/*FILEHEAD(apf.js)SIZE(96350)TIME(Mon, 30 Apr 2012 22:00:16 GMT)*/
77

88
/*
99
* See the NOTICE file distributed with this work for additional
@@ -414,6 +414,7 @@ VERSION:'3.0beta',
414414
apf.hasContentEditableContainerBug = apf.isWebkit;
415415
// Try transform first for forward compatibility
416416
var props = ["transform", "OTransform", "KhtmlTransform", "MozTransform", "WebkitTransform"],
417+
props2 = ["transition", "OTransition", "KhtmlTransition", "MozTransition", "WebkitTransition"],
417418
prefixR = ["", "O", "Khtml", "Moz", "Webkit"],
418419
prefixC = ["", "o-", "khtml-", "moz-", "webkit-"],
419420
events = ["transitionend", "transitionend", "transitionend", "transitionend", "webkitTransitionEnd"],
@@ -424,6 +425,7 @@ VERSION:'3.0beta',
424425
for (; i < l && !this.supportCSSAnim; ++i) {
425426
if (typeof t.style[props[i]] == "undefined") continue;
426427
this.supportCSSAnim = props[i];
428+
this.supportCSSTransition = props2[i];
427429
this.runtimeStylePrefix = prefixR[i];
428430
this.classNamePrefix = prefixC[i];
429431
this.cssAnimEvent = events[i];
@@ -11429,7 +11431,7 @@ apf.Sort = function(xmlNode){
1142911431

1143011432

1143111433

11432-
/*FILEHEAD(core/lib/tween.js)SIZE(35723)TIME(Sat, 28 Apr 2012 21:06:18 GMT)*/
11434+
/*FILEHEAD(core/lib/tween.js)SIZE(35741)TIME(Mon, 30 Apr 2012 22:55:42 GMT)*/
1143311435

1143411436
/*
1143511437
* See the NOTICE file distributed with this work for additional
@@ -11780,7 +11782,7 @@ var ID = "id",
1178011782
oHtml.style.position = "relative";
1178111783
} catch(e){}
1178211784

11783-
var useCSSAnim = (apf.supportCSSAnim && apf.supportCSSTransition && CSSPROPS[info.type]),
11785+
var useCSSAnim = (false && apf.supportCSSAnim && apf.supportCSSTransition && CSSPROPS[info.type]),
1178411786
isTransform = (info.type == TRANSFORM);
1178511787

1178611788
info.method = useCSSAnim ? info.type : isTransform
@@ -11937,7 +11939,7 @@ var ID = "id",
1193711939
}
1193811940

1193911941
var animCSS, isTransform,
11940-
useCSSAnim = apf.supportCSSAnim && apf.supportCSSTransition,
11942+
useCSSAnim = false && apf.supportCSSAnim && apf.supportCSSTransition,
1194111943
hasCSSAnims = false,
1194211944
cssDuration = ((info.steps * info.interval) / 1000),
1194311945
cssAnim = CSSTIMING[info.anim || 0],

0 commit comments

Comments
 (0)