Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

do everything because I am bad at breaking up commits.

  • Loading branch information...
commit 167da7d62da3dccbc7c86d6f1ac86f2c7e617183 1 parent 9a90c75
@gjtorikian gjtorikian authored
Showing with 114 additions and 163 deletions.
  1. +30 −32 plugins-client/cloud9.core/www/core/util.js
  2. +0 −43 plugins-client/ext.main/style/icons/file_icons/sprite/file_icons.css
  3. BIN  plugins-client/ext.main/style/icons/file_icons/sprite/file_icons.png
  4. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/css.png
  5. BIN  plugins-client/ext.main/style/icons/file_tree/file_tree.png
  6. BIN  plugins-client/ext.main/style/icons/file_tree/folder.png
  7. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/html.png
  8. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/image.png
  9. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white.png
  10. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_acrobat.png
  11. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_actionscript.png
  12. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_c.png
  13. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_code.png
  14. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_code_red.png
  15. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_coldfusion.png
  16. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_cplusplus.png
  17. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_csharp.png
  18. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_cup.png
  19. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_flash.png
  20. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_go.png
  21. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_h.png
  22. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_php.png
  23. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_picture.png
  24. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_ruby.png
  25. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_text.png
  26. 0  plugins-client/ext.main/style/icons/{file_icons → file_tree}/page_white_wrench.png
  27. BIN  plugins-client/ext.main/style/icons/folder.png
  28. +34 −45 plugins-client/ext.main/style/skins.xml
  29. +28 −21 plugins-client/ext.newresource/newresource.xml
  30. +2 −2 plugins-client/ext.openfiles/openfiles.xml
  31. +1 −6 plugins-client/ext.save/save.xml
  32. +1 −2  plugins-client/ext.tree/tree.xml
  33. +18 −12 plugins-client/ext.zen/zen.js
View
62 plugins-client/cloud9.core/www/core/util.js
@@ -133,32 +133,32 @@ exports.removeInteractive = function (amlNode) {
// map mime-type to css class; see ext.main/style/icons/file_icons/sprite
var SupportedIcons = {
- "application/xhtml+xml":"sprite-file_icons-html",
- "text/css": "sprite-file_icons-css",
- "text/x-scss": "sprite-file_icons-css",
- "text/x-sass": "sprite-file_icons-css",
- "text/html":"sprite-file_icons-html",
+ "application/xhtml+xml":"html",
+ "text/css": "css",
+ "text/x-scss": "css",
+ "text/x-sass": "css",
+ "text/html":"html",
"application/pdf":"page_white_acrobat",
- "image":"sprite-file_icons-image",
- "application/xml":".sprite-file_icons-page_white_code_red",
- "image/svg+xml": ".sprite-file_icons-page_white_picture",
- "text/plain": ".sprite-file_icons-page_white_text",
- "application/javascript": ".sprite-file_icons-page_white_code",
- "application/json": ".sprite-file_icons-page_white_code",
- "text/x-script.python": ".sprite-file_icons-page_white_code",
- "text/x-script.ocaml": ".sprite-file_icons-page_white_code",
- "text/x-script.clojure": ".sprite-file_icons-page_white_code",
- "application/x-httpd-php": ".sprite-file_icons-page_white_php",
- "application/x-sh": ".sprite-file_icons-page_white_wrench",
- "text/x-coldfusion": ".sprite-file_icons-page_white_coldfusion",
- "text/x-script.ruby": ".sprite-file_icons-page_white_ruby",
- "text/x-script.coffeescript": ".sprite-file_icons-page_white_cup",
- "text/cpp": ".sprite-file_icons-page_white_cplusplus",
- "text/x-c": ".sprite-file_icons-page_white_c",
- "text/x-csharp": ".sprite-file_icons-page_white_csharp",
- "text/text/x-java-source": ".sprite-file_icons-page_white_cup",
- "text/x-markdown": ".sprite-file_icons-page_white_text",
- "text/x-xquery": ".sprite-file_icons-page_white_code"
+ "image":"image",
+ "application/xml":"page_white_code_red",
+ "image/svg+xml": "page_white_picture",
+ "text/plain": "page_white_text",
+ "application/javascript": "page_white_code",
+ "application/json": "page_white_code",
+ "text/x-script.python": "page_white_code",
+ "text/x-script.ocaml": "page_white_code",
+ "text/x-script.clojure": "page_white_code",
+ "application/x-httpd-php": "page_white_php",
+ "application/x-sh": "page_white_wrench",
+ "text/x-coldfusion": "page_white_coldfusion",
+ "text/x-script.ruby": "page_white_ruby",
+ "text/x-script.coffeescript": "page_white_cup",
+ "text/cpp": "page_white_cplusplus",
+ "text/x-c": "page_white_c",
+ "text/x-csharp": "page_white_csharp",
+ "text/text/x-java-source": "page_white_cup",
+ "text/x-markdown": "page_white_text",
+ "text/x-xquery": "page_white_code"
};
var contentTypes = {
@@ -234,15 +234,13 @@ var contentTypes = {
};
exports.getFileIcon = function(xmlNode) {
+ if (xmlNode.getAttribute("type") === "folder")
+ return "folder";
+
var name = xmlNode.getAttribute("name");
- var icon = "page_white_text";
- var ext;
+ var ext = name !== null ? name.split(".").pop().toLowerCase() : "text/plain";
- if (name) {
- ext = name.split(".").pop().toLowerCase();
- icon = SupportedIcons[contentTypes[ext]] || "page_white_text";
- }
- return ".sprite-file_icons-" + icon;
+ return SupportedIcons[contentTypes[ext]] || "page_white_text";
};
View
43 plugins-client/ext.main/style/icons/file_icons/sprite/file_icons.css
@@ -1,43 +0,0 @@
-/* glue: 0.2.8.1 hash: 525228f3dc */
-.sprite-file_icons-page_white_wrench,
-.sprite-file_icons-page_white_text,
-.sprite-file_icons-page_white_ruby,
-.sprite-file_icons-page_white_picture,
-.sprite-file_icons-page_white_php,
-.sprite-file_icons-page_white_h,
-.sprite-file_icons-page_white_go,
-.sprite-file_icons-page_white_flash,
-.sprite-file_icons-page_white_cup,
-.sprite-file_icons-page_white_csharp,
-.sprite-file_icons-page_white_cplusplus,
-.sprite-file_icons-page_white_coldfusion,
-.sprite-file_icons-page_white_code_red,
-.sprite-file_icons-page_white_code,
-.sprite-file_icons-page_white_c,
-.sprite-file_icons-page_white_actionscript,
-.sprite-file_icons-page_white_acrobat,
-.sprite-file_icons-page_white,
-.sprite-file_icons-image,
-.sprite-file_icons-html,
-.sprite-file_icons-css{background-image:url('file_icons.png');background-repeat:no-repeat}
-.sprite-file_icons-page_white_wrench{background-position:0px 0px;width:16px;height:16px;}
-.sprite-file_icons-page_white_text{background-position:-16px 0px;width:16px;height:16px;}
-.sprite-file_icons-page_white_ruby{background-position:0px -16px;width:16px;height:16px;}
-.sprite-file_icons-page_white_picture{background-position:-16px -16px;width:16px;height:16px;}
-.sprite-file_icons-page_white_php{background-position:-32px 0px;width:16px;height:16px;}
-.sprite-file_icons-page_white_h{background-position:-32px -16px;width:16px;height:16px;}
-.sprite-file_icons-page_white_go{background-position:0px -32px;width:16px;height:16px;}
-.sprite-file_icons-page_white_flash{background-position:-16px -32px;width:16px;height:16px;}
-.sprite-file_icons-page_white_cup{background-position:-32px -32px;width:16px;height:16px;}
-.sprite-file_icons-page_white_csharp{background-position:-48px 0px;width:16px;height:16px;}
-.sprite-file_icons-page_white_cplusplus{background-position:-48px -16px;width:16px;height:16px;}
-.sprite-file_icons-page_white_coldfusion{background-position:-48px -32px;width:16px;height:16px;}
-.sprite-file_icons-page_white_code_red{background-position:0px -48px;width:16px;height:16px;}
-.sprite-file_icons-page_white_code{background-position:-16px -48px;width:16px;height:16px;}
-.sprite-file_icons-page_white_c{background-position:-32px -48px;width:16px;height:16px;}
-.sprite-file_icons-page_white_actionscript{background-position:-48px -48px;width:16px;height:16px;}
-.sprite-file_icons-page_white_acrobat{background-position:-64px 0px;width:16px;height:16px;}
-.sprite-file_icons-page_white{background-position:-64px -16px;width:16px;height:16px;}
-.sprite-file_icons-image{background-position:-64px -32px;width:16px;height:16px;}
-.sprite-file_icons-html{background-position:-64px -48px;width:16px;height:16px;}
-.sprite-file_icons-css{background-position:0px -64px;width:16px;height:16px;}
View
BIN  plugins-client/ext.main/style/icons/file_icons/sprite/file_icons.png
Deleted file not rendered
View
0  ...ns-client/ext.main/style/icons/file_icons/css.png → ...ins-client/ext.main/style/icons/file_tree/css.png
File renamed without changes
View
BIN  plugins-client/ext.main/style/icons/file_tree/file_tree.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  plugins-client/ext.main/style/icons/file_tree/folder.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  ...s-client/ext.main/style/icons/file_icons/html.png → ...ns-client/ext.main/style/icons/file_tree/html.png
File renamed without changes
View
0  ...-client/ext.main/style/icons/file_icons/image.png → ...s-client/ext.main/style/icons/file_tree/image.png
File renamed without changes
View
0  ...nt/ext.main/style/icons/file_icons/page_white.png → ...ent/ext.main/style/icons/file_tree/page_white.png
File renamed without changes
View
0  ...ain/style/icons/file_icons/page_white_acrobat.png → ...main/style/icons/file_tree/page_white_acrobat.png
File renamed without changes
View
0  ...tyle/icons/file_icons/page_white_actionscript.png → ...style/icons/file_tree/page_white_actionscript.png
File renamed without changes
View
0  .../ext.main/style/icons/file_icons/page_white_c.png → ...t/ext.main/style/icons/file_tree/page_white_c.png
File renamed without changes
View
0  ...t.main/style/icons/file_icons/page_white_code.png → ...xt.main/style/icons/file_tree/page_white_code.png
File renamed without changes
View
0  ...in/style/icons/file_icons/page_white_code_red.png → ...ain/style/icons/file_tree/page_white_code_red.png
File renamed without changes
View
0  .../style/icons/file_icons/page_white_coldfusion.png → ...n/style/icons/file_tree/page_white_coldfusion.png
File renamed without changes
View
0  ...n/style/icons/file_icons/page_white_cplusplus.png → ...in/style/icons/file_tree/page_white_cplusplus.png
File renamed without changes
View
0  ...main/style/icons/file_icons/page_white_csharp.png → ....main/style/icons/file_tree/page_white_csharp.png
File renamed without changes
View
0  ...xt.main/style/icons/file_icons/page_white_cup.png → ...ext.main/style/icons/file_tree/page_white_cup.png
File renamed without changes
View
0  ....main/style/icons/file_icons/page_white_flash.png → ...t.main/style/icons/file_tree/page_white_flash.png
File renamed without changes
View
0  ...ext.main/style/icons/file_icons/page_white_go.png → .../ext.main/style/icons/file_tree/page_white_go.png
File renamed without changes
View
0  .../ext.main/style/icons/file_icons/page_white_h.png → ...t/ext.main/style/icons/file_tree/page_white_h.png
File renamed without changes
View
0  ...xt.main/style/icons/file_icons/page_white_php.png → ...ext.main/style/icons/file_tree/page_white_php.png
File renamed without changes
View
0  ...ain/style/icons/file_icons/page_white_picture.png → ...main/style/icons/file_tree/page_white_picture.png
File renamed without changes
View
0  ...t.main/style/icons/file_icons/page_white_ruby.png → ...xt.main/style/icons/file_tree/page_white_ruby.png
File renamed without changes
View
0  ...t.main/style/icons/file_icons/page_white_text.png → ...xt.main/style/icons/file_tree/page_white_text.png
File renamed without changes
View
0  ...main/style/icons/file_icons/page_white_wrench.png → ....main/style/icons/file_tree/page_white_wrench.png
File renamed without changes
View
BIN  plugins-client/ext.main/style/icons/folder.png
Deleted file not rendered
View
79 plugins-client/ext.main/style/skins.xml
@@ -12029,6 +12029,7 @@
.filemgr-tree:not(.treeOutline) .item-fix.root .item SPAN {
background-image:url(images/tree_close_arrow_small.png);
background-repeat: no-repeat;
+ top: 2px;
}
.treeOutline .item-fix.root.min .item SPAN {
background-image:url(images/tree_close_arrow_small.png) !important;
@@ -12071,10 +12072,15 @@
position:relative;
overflow:hidden;
height:16px;
- padding:1px 0 0 23px;
+ padding:1px 0 0 20px;
text-decoration:none;
white-space: nowrap;
}
+
+ .filemgr-tree .folder .item label .caption {
+ top: -2px;
+ }
+
.filemgr-tree.not(treeOutline) .item LABEL .caption {
color : #101010;
}
@@ -12218,55 +12224,38 @@
opacity : 0.5;
}
- .filemgr-tree .item label.sprite-file_icons-page_white_wrench,
- .filemgr-tree .item label.sprite-file_icons-page_white_text,
- .filemgr-tree .item label.sprite-file_icons-page_white_ruby,
- .filemgr-tree .item label.sprite-file_icons-page_white_picture,
- .filemgr-tree .item label.sprite-file_icons-page_white_php,
- .filemgr-tree .item label.sprite-file_icons-page_white_h,
- .filemgr-tree .item label.sprite-file_icons-page_white_go,
- .filemgr-tree .item label.sprite-file_icons-page_white_flash,
- .filemgr-tree .item label.sprite-file_icons-page_white_cup,
- .filemgr-tree .item label.sprite-file_icons-page_white_csharp,
- .filemgr-tree .item label.sprite-file_icons-page_white_cplusplus,
- .filemgr-tree .item label.sprite-file_icons-page_white_coldfusion,
- .filemgr-tree .item label.sprite-file_icons-page_white_code_red,
- .filemgr-tree .item label.sprite-file_icons-page_white_code,
- .filemgr-tree .item label.sprite-file_icons-page_white_c,
- .filemgr-tree .item label.sprite-file_icons-page_white_actionscript,
- .filemgr-tree .item label.sprite-file_icons-page_white_acrobat,
- .filemgr-tree .item label.sprite-file_icons-page_white,
- .filemgr-tree .item label.sprite-file_icons-image,
- .filemgr-tree .item label.sprite-file_icons-html,
- .filemgr-tree .item label.sprite-file_icons-css{background-repeat:no-repeat}
- .filemgr-tree .item label.sprite-file_icons-page_white_wrench{background-position:0px 0px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_text{background-position:-16px 0px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_ruby{background-position:0px -16px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_picture{background-position:-16px -16px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_php{background-position:-32px 0px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_h{background-position:-32px -16px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_go{background-position:0px -32px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_flash{background-position:-16px -32px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_cup{background-position:-32px -32px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_csharp{background-position:-48px 0px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_cplusplus{background-position:-48px -16px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_coldfusion{background-position:-48px -32px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_code_red{background-position:0px -48px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_code{background-position:-16px -48px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_c{background-position:-32px -48px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_actionscript{background-position:-48px -48px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white_acrobat{background-position:-64px 0px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-page_white{background-position:-64px -16px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-image{background-position:-64px -32px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-html{background-position:-64px -48px;width:16px;height:16px;}
- .filemgr-tree .item label.sprite-file_icons-css{background-position:0px -64px;width:16px;height:16px;}
+ .filemgr-tree .item label {background-image:url(icons/file_tree/file_tree.png);background-repeat:no-repeat}
+ .filemgr-tree div.page_white_wrench label{background-position:0px 0px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_text label{background-position:-16px 0px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_ruby label{background-position:0px -16px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_picture label{background-position:-16px -16px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_php label{background-position:-32px 0px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_h label{background-position:-32px -16px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_go label{background-position:0px -32px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_flash label{background-position:-16px -32px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_cup label,div.page_white_cup span{background-position:-32px -32px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_csharp label{background-position:-48px 0px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_cplusplus label{background-position:-48px -16px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_coldfusion label{background-position:-48px -32px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_code_red label{background-position:0px -48px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_code label{background-position:-16px -48px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_c label{background-position:-32px -48px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_actionscript label{background-position:-48px -48px;width:16px;height:16px;}
+ .filemgr-tree div.page_white_acrobat label{background-position:-64px 0px;width:16px;height:16px;}
+ .filemgr-tree div.page_white label{background-position:-64px -16px;width:16px;height:16px;}
+ .filemgr-tree div.image label{background-position:-80px 0px;width:14px;height:14px;}
+ .filemgr-tree div.html label{background-position:-64px -32px;width:16px;height:11px;}
+ .filemgr-tree div.css label{background-position:-64px -43px;width:16px;height:11px;}
+ .filemgr-tree div.folder label{background-position:0px -64px;width:15px;height:15px;}
+
+ .filemgr-tree div.item-fix div.label-content {padding-left: 5px};
]]></a:style>
<a:style condition="apf.isChrome || apf.isSafari"><![CDATA[
.filemgr-tree .item LABEL .caption {
height:16px;
}
.filemgr-tree.not(treeOutline) .item LABEL .caption {
- padding:2px 0 0 23px;
+ padding:2px 0 0 20px;
}
#txt_rename {
@@ -12297,7 +12286,7 @@
<div class="item">
<span>x</span>
<div class="label-content">
- <label class="sprite-file_icons-css">
+ <label>
<u class="caption">-</u>
</label>
</div>
View
49 plugins-client/ext.newresource/newresource.xml
@@ -22,11 +22,18 @@
class = "noscrollbar"
scrollbar = "sbShared 12 12 55"
each = "item"
- eachvalue = "[@value]"
+ eachvalue = "[@name]"
style = "overflow:hidden"
+ skin = "tree"
onafterchoose = "
btnFileTemplateSave.dispatchEvent('click');
- " />
+ ">
+ <a:each match="[item]">
+ <a:caption value="[@caption]" />
+ <a:css match="[item]" value="{require('core/util').getFileIcon(%[.])}" />
+ <a:icon match="[item]" value="{require('core/ide').staticPrefix}/ext/main/style/icons/file_tree/file_tree.png" />
+ </a:each>
+ </a:list>
<a:hbox pack="end" padding="7" edge="10">
<a:button id="btnFileTemplateSave" width="80" default="2"
class="btn-green" skin="btn-default-css3" caption="Create"
@@ -45,9 +52,9 @@
<a:model id="mdlFileTemplates">
<templates>
- <item value="txt" icon="page_white_text.png" caption="Text file"><![CDATA[]]></item>
- <item value="js" icon="page_white_code.png" caption="JavaScript file"><![CDATA[]]></item>
- <item value="js" icon="page_white_code.png" caption="Unit Test"><![CDATA["use strict";
+ <item name=".txt" icon="file_tree/file_tree.png" css="page_white_text" caption="Text file"><![CDATA[]]></item>
+ <item name=".js" icon="file_tree/file_tree.png" css="page_white_code" caption="JavaScript file"><![CDATA[]]></item>
+ <item name=".js" icon="file_tree/file_tree.png" css="page_white_code" caption="Unit Test"><![CDATA["use strict";
require("./support/paths");
var assert = require("assert");
@@ -64,9 +71,9 @@ module.exports = {
if (typeof module !== "undefined" && module === require.main) {
require("asyncjs").test.testcase(module.exports).exec()
}]]></item>
- <item value="stest" icon="page_white_code.png" caption="Selenium Test"><![CDATA[{}]]></item>
- <item value="coffee" icon="page_white_code.png" caption="CoffeeScript file"><![CDATA[]]></item>
- <item value="html" icon="html.png" caption="HTML file"><![CDATA[<!DOCTYPE html>
+ <item name=".stest" icon="file_tree/file_tree.png" css="page_white_code" caption="Selenium Test"><![CDATA[{}]]></item>
+ <item name=".coffee" icon="file_tree/file_tree.png" css="page_white_code" caption="CoffeeScript file"><![CDATA[]]></item>
+ <item name=".html" icon="file_tree/file_tree.png" css="html" caption="HTML file"><![CDATA[<!DOCTYPE html>
<html>
<head>
<title> </title>
@@ -76,24 +83,24 @@ if (typeof module !== "undefined" && module === require.main) {
</body>
</html>
]]></item>
- <item value="xml" icon="page_white_code_red.png" caption="XML file"><![CDATA[]]></item>
- <item value="xq" icon="page_white_code.png" caption="XQuery file"><![CDATA[xquery version "1.0";
+ <item name=".xml" icon="file_tree/file_tree.png" css="page_white_code_red" caption="XML file"><![CDATA[]]></item>
+ <item name=".xq" icon="file_tree/file_tree.png" css="page_white_code" caption="XQuery file"><![CDATA[xquery version "1.0";
let $message := "Hello World!"
return <results>
<message>{$message}</message>
</results>]]></item>
- <item value="css" icon="css.png" caption="CSS file"><![CDATA[]]></item>
- <item value="scss" icon="css.png" caption="SCSS file"><![CDATA[]]></item>
- <item value="svg" icon="page_white_picture.png" caption="SVG file"><![CDATA[]]></item>
- <item value="py" icon="script_code.png" caption="Python file"><![CDATA[]]></item>
- <item value="php" icon="page_white_php.png" caption="PHP file"><![CDATA[<?php
+ <item name=".css" icon="file_tree/file_tree.png" css="css" caption="CSS file"><![CDATA[]]></item>
+ <item name=".scss" icon="file_tree/file_tree.png" css="css" caption="SCSS file"><![CDATA[]]></item>
+ <item name=".svg" icon="file_tree/file_tree.png" css="page_white_picture" caption="SVG file"><![CDATA[]]></item>
+ <item name=".py" icon="file_tree/file_tree.png" css="page_white_code" caption="Python file"><![CDATA[]]></item>
+ <item name=".php" icon="file_tree/file_tree.png" css="page_white_php" caption="PHP file"><![CDATA[<?php
?>]]></item>
- <item value="rb" icon="page_white_ruby.png" caption="Ruby file"><![CDATA[]]></item>
- <item value="mli" icon="page_white_code.png" caption="OCaml file"><![CDATA[]]></item>
- <item value="clj" icon="page_white_code.png" caption="Clojure file"><![CDATA[]]></item>
- <item value="md" icon="page_white_text.png" caption="Markdown"><![CDATA[]]></item>
- <item value="js" icon="page_white_code.png" caption="Express file"><![CDATA[// *******************************************************
+ <item name=".rb" icon="file_tree/file_tree.png" css="page_white_ruby" caption="Ruby file"><![CDATA[]]></item>
+ <item name=".mli" icon="file_tree/file_tree.png" css="page_white_code" caption="OCaml file"><![CDATA[]]></item>
+ <item name=".clj" icon="file_tree/file_tree.png" css="page_white_code" caption="Clojure file"><![CDATA[]]></item>
+ <item name=".md" icon="file_tree/file_tree.png" css="page_white_text" caption="Markdown"><![CDATA[]]></item>
+ <item name=".js" icon="file_tree/file_tree.png" css="page_white_code" caption="Express file"><![CDATA[// *******************************************************
// expressjs template
//
// assumes: npm install express
@@ -125,7 +132,7 @@ app.configure('production', function(){
});
// *******************************************************
]]></item>
- <item value="js" icon="page_white_code.png" caption="Node.js web server"><![CDATA[var http = require('http');
+ <item name=".js" icon="file_tree/file_tree.png" css="page_white_code" caption="Node.js web server"><![CDATA[var http = require('http');
http.createServer(function (req, res) {
res.writeHead(200, {'Content-Type': 'text/plain'});
res.end('Hello World from Cloud9\n');
View
4 plugins-client/ext.openfiles/openfiles.xml
@@ -45,8 +45,8 @@
skin = "tree">
<a:each match="[file]" sort="[@name]" sort-method="filesort">
<a:caption match="[@name]" value="{([../@changed] == 1 ? '*' : '') + [.] + (cbShowFiles.checked ? ' - ' + [../@path].split('/').slice(-2).join('/') : '')}" />
- <a:icon match="[folder|project]" value="folder.png" />
- <a:icon match="[file]" class="{require('core/util').getFileIcon(%[.])}" />
+ <a:css match="[project|file|folder]" value="{require('core/util').getFileIcon(%[.])}" />
+ <a:icon match="[project|file|folder]" value="{require('core/ide').staticPrefix}/ext/main/style/icons/file_tree/file_tree.png" />
</a:each>
<a:remove match="[file|folder]" />
</a:list>
View
7 plugins-client/ext.save/save.xml
@@ -101,12 +101,7 @@
match = "[folder]"
get = "{location.host &amp;&amp; davProject.readdir([@path])}" />
<a:caption match="[@name]" />
- <a:icon
- match = "[folder]"
- value = "folder.png" />
- <a:icon
- match = "[file]"
- class = "{require('core/util').getFileIcon(%[.])}" />
+ <a:css match="[project|file|folder]" value="{require('core/util').getFileIcon(%[.])}" />
<a:css match="[file]" value="file_item"></a:css>
</a:each>
<a:add type="folder" get="{davProject.mkdir([@path], 'New Folder')}" />
View
3  plugins-client/ext.tree/tree.xml
@@ -38,11 +38,10 @@
<a:each match="[project|file|folder]" sort="[@name]" sort-method="filesort">
<a:insert match="[folder]" get="{davProject.readdir(%[.].getAttribute('path'))}" />
<a:caption match="[@name]" value="{([../@changed] == 1 ? '*' : '') + [.]}" />
- <a:icon match="[folder|project]" value="folder.png" />
<a:selectable match="[folder|file[not(@type='fileupload')]]" />
<a:icon match="[file[@type='fileupload']]" value="file-tree-load-spinner.gif" />
<a:css match="[file[@type='fileupload']]" value="fileupload" />
- <a:icon match="[file]" class="{require('core/util').getFileIcon(%[.])}" value="{require('core/ide').staticPrefix}/ext/main/style/icons/file_icons/sprite/file_icons.png" />
+ <a:css match="[project|file|folder]" value="{require('core/util').getFileIcon(%[.])}" />
</a:each>
<a:add type="folder" get="{davProject.mkdir(%[.].getAttribute('path'), 'New Folder')}" />
View
30 plugins-client/ext.zen/zen.js
@@ -157,12 +157,20 @@ module.exports = ext.register("ext/zen/zen", {
page.appendChild(button);
});
- vbMain.parentNode.appendChild(new apf.vbox({
- anchors: "0 0 0 0",
- id: "vbZen",
- "class": "vbZen",
- visible: false
- }));
+ ide.addEventListener("enterzen", function() {
+ vbMain.parentNode.appendChild(new apf.vbox({
+ anchors: "0 0 0 0",
+ id: "vbZen",
+ "class": "vbZen",
+ visible: false
+ }));
+
+ vbZen.addEventListener("resize", function(e) {
+ if (_self.isFocused) {
+ _self.calculatePositions();
+ }
+ });
+ });
setTimeout(function() {
_self.updateButtonPosition();
@@ -171,12 +179,6 @@ module.exports = ext.register("ext/zen/zen", {
this.animateZen = document.getElementById("animateZen");
this.animateZenPosition = document.getElementById("animateZenPosition");
- vbZen.addEventListener("resize", function(e) {
- if (_self.isFocused) {
- _self.calculatePositions();
- }
- });
-
ide.addEventListener("exitfullscreen", function() {
_self.escapeFromZenMode(false, true);
});
@@ -301,6 +303,8 @@ module.exports = ext.register("ext/zen/zen", {
* @param {boolean} slow Whether to slow down the animation
*/
enterIntoZenMode : function(slow) {
+ ide.dispatchEvent("enterzen");
+
var _self = this;
var activeElement = apf.document.activeElement;
@@ -381,6 +385,8 @@ module.exports = ext.register("ext/zen/zen", {
if (this.isFocused === false)
return;
+ ide.dispatchEvent("escapezen");
+
var _self = this;
var activeElement = apf.document.activeElement;
Please sign in to comment.
Something went wrong with that request. Please try again.