Skip to content
This repository
Browse code

Revert "Merge pull request #2493 from ajaxorg/speedup"

This reverts commit e7fe0f3, reversing
changes made to 67229a1.
  • Loading branch information...
commit a63a837023ebeffc5411e7ba6068df8abbe50f61 1 parent c24e119
Mike de Boer mikedeboer authored

Showing 70 changed files with 57 additions and 109 deletions. Show diff stats Hide diff stats

  1. +0 13 build/json_minifier.js
  2. +12 11 plugins-client/cloud9.core/www/core/util.js
  3. 0  plugins-client/ext.main/style/icons/{file_tree → }/css.png
  4. BIN  plugins-client/ext.main/style/icons/file_tree/file_tree.png
  5. BIN  plugins-client/ext.main/style/icons/file_tree/folder.png
  6. BIN  plugins-client/ext.main/style/icons/folder.png
  7. 0  plugins-client/ext.main/style/icons/{file_tree → }/html.png
  8. 0  plugins-client/ext.main/style/icons/{file_tree → }/image.png
  9. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white.png
  10. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_acrobat.png
  11. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_actionscript.png
  12. BIN  plugins-client/ext.main/style/icons/page_white_add.png
  13. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_c.png
  14. BIN  plugins-client/ext.main/style/icons/page_white_camera.png
  15. BIN  plugins-client/ext.main/style/icons/page_white_cd.png
  16. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_code.png
  17. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_code_red.png
  18. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_coldfusion.png
  19. BIN  plugins-client/ext.main/style/icons/page_white_compressed.png
  20. BIN  plugins-client/ext.main/style/icons/page_white_copy.png
  21. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_cplusplus.png
  22. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_csharp.png
  23. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_cup.png
  24. BIN  plugins-client/ext.main/style/icons/page_white_database.png
  25. BIN  plugins-client/ext.main/style/icons/page_white_delete.png
  26. BIN  plugins-client/ext.main/style/icons/page_white_dvd.png
  27. BIN  plugins-client/ext.main/style/icons/page_white_edit.png
  28. BIN  plugins-client/ext.main/style/icons/page_white_error.png
  29. BIN  plugins-client/ext.main/style/icons/page_white_excel.png
  30. BIN  plugins-client/ext.main/style/icons/page_white_find.png
  31. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_flash.png
  32. BIN  plugins-client/ext.main/style/icons/page_white_freehand.png
  33. BIN  plugins-client/ext.main/style/icons/page_white_gear.png
  34. BIN  plugins-client/ext.main/style/icons/page_white_get.png
  35. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_go.png
  36. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_h.png
  37. BIN  plugins-client/ext.main/style/icons/page_white_horizontal.png
  38. BIN  plugins-client/ext.main/style/icons/page_white_key.png
  39. BIN  plugins-client/ext.main/style/icons/page_white_lightning.png
  40. BIN  plugins-client/ext.main/style/icons/page_white_link.png
  41. BIN  plugins-client/ext.main/style/icons/page_white_magnify.png
  42. BIN  plugins-client/ext.main/style/icons/page_white_medal.png
  43. BIN  plugins-client/ext.main/style/icons/page_white_office.png
  44. BIN  plugins-client/ext.main/style/icons/page_white_paint.png
  45. BIN  plugins-client/ext.main/style/icons/page_white_paintbrush.png
  46. BIN  plugins-client/ext.main/style/icons/page_white_paste.png
  47. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_php.png
  48. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_picture.png
  49. BIN  plugins-client/ext.main/style/icons/page_white_powerpoint.png
  50. BIN  plugins-client/ext.main/style/icons/page_white_put.png
  51. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_ruby.png
  52. BIN  plugins-client/ext.main/style/icons/page_white_stack.png
  53. BIN  plugins-client/ext.main/style/icons/page_white_star.png
  54. BIN  plugins-client/ext.main/style/icons/page_white_swoosh.png
  55. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_text.png
  56. BIN  plugins-client/ext.main/style/icons/page_white_text_width.png
  57. BIN  plugins-client/ext.main/style/icons/page_white_tux.png
  58. BIN  plugins-client/ext.main/style/icons/page_white_vector.png
  59. BIN  plugins-client/ext.main/style/icons/page_white_visualstudio.png
  60. BIN  plugins-client/ext.main/style/icons/page_white_width.png
  61. BIN  plugins-client/ext.main/style/icons/page_white_word.png
  62. BIN  plugins-client/ext.main/style/icons/page_white_world.png
  63. 0  plugins-client/ext.main/style/icons/{file_tree → }/page_white_wrench.png
  64. BIN  plugins-client/ext.main/style/icons/page_white_zip.png
  65. +2 35 plugins-client/ext.main/style/skins.xml
  66. +21 28 plugins-client/ext.newresource/newresource.xml
  67. +2 2 plugins-client/ext.openfiles/openfiles.xml
  68. +6 1 plugins-client/ext.save/save.xml
  69. +2 1  plugins-client/ext.tree/tree.xml
  70. +12 18 plugins-client/ext.zen/zen.js
13 build/json_minifier.js
... ... @@ -1,13 +0,0 @@
1   -var args = process.argv.slice(2),
2   - fileIn = args[0],
3   - fileOut = args[1],
4   - fs = require("fs");
5   -
6   - fs.readFile(fileIn, "utf8", function(err, json) {
7   - if (err) {
8   - console.error(err);
9   - process.exit(1);
10   - }
11   -
12   - fs.writeFileSync(fileOut, JSON.stringify(JSON.parse(json), null));
13   - });
23 plugins-client/cloud9.core/www/core/util.js
@@ -131,13 +131,12 @@ exports.removeInteractive = function (amlNode) {
131 131 }
132 132 };
133 133
134   -// map mime-type to css class; see ext.main/style/icons/file_icons/sprite
135 134 var SupportedIcons = {
136   - "application/xhtml+xml":"html",
137   - "text/css": "css",
138   - "text/x-scss": "css",
139   - "text/x-sass": "css",
140   - "text/html":"html",
  135 + "application/xhtml+xml":"html",
  136 + "text/css": "css",
  137 + "text/x-scss": "css",
  138 + "text/x-sass": "css",
  139 + "text/html":"html",
141 140 "application/pdf":"page_white_acrobat",
142 141 "image":"image",
143 142 "application/xml":"page_white_code_red",
@@ -234,13 +233,15 @@ var contentTypes = {
234 233 };
235 234
236 235 exports.getFileIcon = function(xmlNode) {
237   - if (xmlNode.getAttribute("type") === "folder")
238   - return "folder";
239   -
240 236 var name = xmlNode.getAttribute("name");
241   - var ext = name !== null ? name.split(".").pop().toLowerCase() : "text/plain";
  237 + var icon = "page_white_text";
  238 + var ext;
242 239
243   - return SupportedIcons[contentTypes[ext]] || "page_white_text";
  240 + if (name) {
  241 + ext = name.split(".").pop().toLowerCase();
  242 + icon = SupportedIcons[contentTypes[ext]] || "page_white_text";
  243 + }
  244 + return icon + ".png";
244 245 };
245 246
246 247
0  ...ins-client/ext.main/style/icons/file_tree/css.png → plugins-client/ext.main/style/icons/css.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/file_tree/file_tree.png
BIN  plugins-client/ext.main/style/icons/file_tree/folder.png
BIN  plugins-client/ext.main/style/icons/folder.png
0  ...ns-client/ext.main/style/icons/file_tree/html.png → plugins-client/ext.main/style/icons/html.png
File renamed without changes
0  ...s-client/ext.main/style/icons/file_tree/image.png → plugins-client/ext.main/style/icons/image.png
File renamed without changes
0  ...ent/ext.main/style/icons/file_tree/page_white.png → plugins-client/ext.main/style/icons/page_white.png
File renamed without changes
0  ...main/style/icons/file_tree/page_white_acrobat.png → ...lient/ext.main/style/icons/page_white_acrobat.png
File renamed without changes
0  ...style/icons/file_tree/page_white_actionscript.png → .../ext.main/style/icons/page_white_actionscript.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_add.png
0  ...t/ext.main/style/icons/file_tree/page_white_c.png → plugins-client/ext.main/style/icons/page_white_c.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_camera.png
BIN  plugins-client/ext.main/style/icons/page_white_cd.png
0  ...xt.main/style/icons/file_tree/page_white_code.png → ...s-client/ext.main/style/icons/page_white_code.png
File renamed without changes
0  ...ain/style/icons/file_tree/page_white_code_red.png → ...ient/ext.main/style/icons/page_white_code_red.png
File renamed without changes
0  ...n/style/icons/file_tree/page_white_coldfusion.png → ...nt/ext.main/style/icons/page_white_coldfusion.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_compressed.png
BIN  plugins-client/ext.main/style/icons/page_white_copy.png
0  ...in/style/icons/file_tree/page_white_cplusplus.png → ...ent/ext.main/style/icons/page_white_cplusplus.png
File renamed without changes
0  ....main/style/icons/file_tree/page_white_csharp.png → ...client/ext.main/style/icons/page_white_csharp.png
File renamed without changes
0  ...ext.main/style/icons/file_tree/page_white_cup.png → ...ns-client/ext.main/style/icons/page_white_cup.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_database.png
BIN  plugins-client/ext.main/style/icons/page_white_delete.png
BIN  plugins-client/ext.main/style/icons/page_white_dvd.png
BIN  plugins-client/ext.main/style/icons/page_white_edit.png
BIN  plugins-client/ext.main/style/icons/page_white_error.png
BIN  plugins-client/ext.main/style/icons/page_white_excel.png
BIN  plugins-client/ext.main/style/icons/page_white_find.png
0  ...t.main/style/icons/file_tree/page_white_flash.png → ...-client/ext.main/style/icons/page_white_flash.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_freehand.png
BIN  plugins-client/ext.main/style/icons/page_white_gear.png
BIN  plugins-client/ext.main/style/icons/page_white_get.png
0  .../ext.main/style/icons/file_tree/page_white_go.png → ...ins-client/ext.main/style/icons/page_white_go.png
File renamed without changes
0  ...t/ext.main/style/icons/file_tree/page_white_h.png → plugins-client/ext.main/style/icons/page_white_h.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_horizontal.png
BIN  plugins-client/ext.main/style/icons/page_white_key.png
BIN  plugins-client/ext.main/style/icons/page_white_lightning.png
BIN  plugins-client/ext.main/style/icons/page_white_link.png
BIN  plugins-client/ext.main/style/icons/page_white_magnify.png
BIN  plugins-client/ext.main/style/icons/page_white_medal.png
BIN  plugins-client/ext.main/style/icons/page_white_office.png
BIN  plugins-client/ext.main/style/icons/page_white_paint.png
BIN  plugins-client/ext.main/style/icons/page_white_paintbrush.png
BIN  plugins-client/ext.main/style/icons/page_white_paste.png
0  ...ext.main/style/icons/file_tree/page_white_php.png → ...ns-client/ext.main/style/icons/page_white_php.png
File renamed without changes
0  ...main/style/icons/file_tree/page_white_picture.png → ...lient/ext.main/style/icons/page_white_picture.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_powerpoint.png
BIN  plugins-client/ext.main/style/icons/page_white_put.png
0  ...xt.main/style/icons/file_tree/page_white_ruby.png → ...s-client/ext.main/style/icons/page_white_ruby.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_stack.png
BIN  plugins-client/ext.main/style/icons/page_white_star.png
BIN  plugins-client/ext.main/style/icons/page_white_swoosh.png
0  ...xt.main/style/icons/file_tree/page_white_text.png → ...s-client/ext.main/style/icons/page_white_text.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_text_width.png
BIN  plugins-client/ext.main/style/icons/page_white_tux.png
BIN  plugins-client/ext.main/style/icons/page_white_vector.png
BIN  plugins-client/ext.main/style/icons/page_white_visualstudio.png
BIN  plugins-client/ext.main/style/icons/page_white_width.png
BIN  plugins-client/ext.main/style/icons/page_white_word.png
BIN  plugins-client/ext.main/style/icons/page_white_world.png
0  ....main/style/icons/file_tree/page_white_wrench.png → ...client/ext.main/style/icons/page_white_wrench.png
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_zip.png
37 plugins-client/ext.main/style/skins.xml
@@ -12081,7 +12081,6 @@
12081 12081 .filemgr-tree:not(.treeOutline) .item-fix.root .item SPAN {
12082 12082 background-image:url(images/tree_close_arrow_small.png);
12083 12083 background-repeat: no-repeat;
12084   - top: 2px;
12085 12084 }
12086 12085 .treeOutline .item-fix.root.min .item SPAN {
12087 12086 background-image:url(images/tree_close_arrow_small.png) !important;
@@ -12117,22 +12116,16 @@
12117 12116 }
12118 12117
12119 12118 .filemgr-tree .item LABEL .caption {
12120   - width: 123px;
12121 12119 font-family : Tahoma, Arial;
12122 12120 font-size : 11px;
12123 12121 display:block;
12124 12122 position:relative;
12125 12123 overflow:hidden;
12126 12124 height:16px;
12127   - padding:1px 0 0 20px;
  12125 + padding:1px 0 0 23px;
12128 12126 text-decoration:none;
12129 12127 white-space: nowrap;
12130 12128 }
12131   -
12132   - .filemgr-tree .folder .item label .caption {
12133   - top: -2px;
12134   - }
12135   -
12136 12129 .filemgr-tree.not(treeOutline) .item LABEL .caption {
12137 12130 color : #101010;
12138 12131 }
@@ -12275,39 +12268,13 @@
12275 12268 .filemgr-tree .syncing_added, .filemgr-tree .syncing_added.selected{
12276 12269 opacity : 0.5;
12277 12270 }
12278   -
12279   - .filemgr-tree .item label {background-image:url(icons/file_tree/file_tree.png);background-repeat:no-repeat}
12280   - .filemgr-tree div.page_white_wrench label{background-position:0px 0px;width:16px;height:16px;}
12281   - .filemgr-tree div.page_white_text label{background-position:-16px 0px;width:16px;height:16px;}
12282   - .filemgr-tree div.page_white_ruby label{background-position:0px -16px;width:16px;height:16px;}
12283   - .filemgr-tree div.page_white_picture label{background-position:-16px -16px;width:16px;height:16px;}
12284   - .filemgr-tree div.page_white_php label{background-position:-32px 0px;width:16px;height:16px;}
12285   - .filemgr-tree div.page_white_h label{background-position:-32px -16px;width:16px;height:16px;}
12286   - .filemgr-tree div.page_white_go label{background-position:0px -32px;width:16px;height:16px;}
12287   - .filemgr-tree div.page_white_flash label{background-position:-16px -32px;width:16px;height:16px;}
12288   - .filemgr-tree div.page_white_cup label,div.page_white_cup span{background-position:-32px -32px;width:16px;height:16px;}
12289   - .filemgr-tree div.page_white_csharp label{background-position:-48px 0px;width:16px;height:16px;}
12290   - .filemgr-tree div.page_white_cplusplus label{background-position:-48px -16px;width:16px;height:16px;}
12291   - .filemgr-tree div.page_white_coldfusion label{background-position:-48px -32px;width:16px;height:16px;}
12292   - .filemgr-tree div.page_white_code_red label{background-position:0px -48px;width:16px;height:16px;}
12293   - .filemgr-tree div.page_white_code label{background-position:-16px -48px;width:16px;height:16px;}
12294   - .filemgr-tree div.page_white_c label{background-position:-32px -48px;width:16px;height:16px;}
12295   - .filemgr-tree div.page_white_actionscript label{background-position:-48px -48px;width:16px;height:16px;}
12296   - .filemgr-tree div.page_white_acrobat label{background-position:-64px 0px;width:16px;height:16px;}
12297   - .filemgr-tree div.page_white label{background-position:-64px -16px;width:16px;height:16px;}
12298   - .filemgr-tree div.image label{background-position:-80px 0px;width:14px;height:14px;}
12299   - .filemgr-tree div.html label{background-position:-64px -32px;width:16px;height:11px;}
12300   - .filemgr-tree div.css label{background-position:-64px -43px;width:16px;height:11px;}
12301   - .filemgr-tree div.folder label{background-position:0px -64px;width:15px;height:15px;}
12302   -
12303   - .filemgr-tree div.item-fix div.label-content {padding-left: 5px};
12304 12271 ]]></a:style>
12305 12272 <a:style condition="apf.isChrome || apf.isSafari"><![CDATA[
12306 12273 .filemgr-tree .item LABEL .caption {
12307 12274 height:16px;
12308 12275 }
12309 12276 .filemgr-tree.not(treeOutline) .item LABEL .caption {
12310   - padding:2px 0 0 20px;
  12277 + padding:2px 0 0 23px;
12311 12278 }
12312 12279
12313 12280 #txt_rename {
49 plugins-client/ext.newresource/newresource.xml
@@ -22,18 +22,11 @@
22 22 class = "noscrollbar"
23 23 scrollbar = "sbShared 12 12 55"
24 24 each = "item"
25   - eachvalue = "[@name]"
  25 + eachvalue = "[@value]"
26 26 style = "overflow:hidden"
27   - skin = "tree"
28 27 onafterchoose = "
29 28 btnFileTemplateSave.dispatchEvent('click');
30   - ">
31   - <a:each match="[item]">
32   - <a:caption value="[@caption]" />
33   - <a:css match="[item]" value="{require('core/util').getFileIcon(%[.])}" />
34   - <a:icon match="[item]" value="{require('core/ide').staticPrefix}/ext/main/style/icons/file_tree/file_tree.png" />
35   - </a:each>
36   - </a:list>
  29 + " />
37 30 <a:hbox pack="end" padding="7" edge="10">
38 31 <a:button id="btnFileTemplateSave" width="80" default="2"
39 32 class="btn-green" skin="btn-default-css3" caption="Create"
@@ -52,9 +45,9 @@
52 45
53 46 <a:model id="mdlFileTemplates">
54 47 <templates>
55   - <item name=".txt" icon="file_tree/file_tree.png" css="page_white_text" caption="Text file"><![CDATA[]]></item>
56   - <item name=".js" icon="file_tree/file_tree.png" css="page_white_code" caption="JavaScript file"><![CDATA[]]></item>
57   - <item name=".js" icon="file_tree/file_tree.png" css="page_white_code" caption="Unit Test"><![CDATA["use strict";
  48 + <item value="txt" icon="page_white_text.png" caption="Text file"><![CDATA[]]></item>
  49 + <item value="js" icon="page_white_code.png" caption="JavaScript file"><![CDATA[]]></item>
  50 + <item value="js" icon="page_white_code.png" caption="Unit Test"><![CDATA["use strict";
58 51 require("./support/paths");
59 52
60 53 var assert = require("assert");
@@ -71,9 +64,9 @@ module.exports = {
71 64 if (typeof module !== "undefined" && module === require.main) {
72 65 require("asyncjs").test.testcase(module.exports).exec()
73 66 }]]></item>
74   - <item name=".stest" icon="file_tree/file_tree.png" css="page_white_code" caption="Selenium Test"><![CDATA[{}]]></item>
75   - <item name=".coffee" icon="file_tree/file_tree.png" css="page_white_code" caption="CoffeeScript file"><![CDATA[]]></item>
76   - <item name=".html" icon="file_tree/file_tree.png" css="html" caption="HTML file"><![CDATA[<!DOCTYPE html>
  67 + <item value="stest" icon="page_white_code.png" caption="Selenium Test"><![CDATA[{}]]></item>
  68 + <item value="coffee" icon="page_white_code.png" caption="CoffeeScript file"><![CDATA[]]></item>
  69 + <item value="html" icon="html.png" caption="HTML file"><![CDATA[<!DOCTYPE html>
77 70 <html>
78 71 <head>
79 72 <title> </title>
@@ -83,24 +76,24 @@ if (typeof module !== "undefined" && module === require.main) {
83 76 </body>
84 77 </html>
85 78 ]]></item>
86   - <item name=".xml" icon="file_tree/file_tree.png" css="page_white_code_red" caption="XML file"><![CDATA[]]></item>
87   - <item name=".xq" icon="file_tree/file_tree.png" css="page_white_code" caption="XQuery file"><![CDATA[xquery version "1.0";
  79 + <item value="xml" icon="page_white_code_red.png" caption="XML file"><![CDATA[]]></item>
  80 + <item value="xq" icon="page_white_code.png" caption="XQuery file"><![CDATA[xquery version "1.0";
88 81 let $message := "Hello World!"
89 82 return <results>
90 83 <message>{$message}</message>
91 84 </results>]]></item>
92   - <item name=".css" icon="file_tree/file_tree.png" css="css" caption="CSS file"><![CDATA[]]></item>
93   - <item name=".scss" icon="file_tree/file_tree.png" css="css" caption="SCSS file"><![CDATA[]]></item>
94   - <item name=".svg" icon="file_tree/file_tree.png" css="page_white_picture" caption="SVG file"><![CDATA[]]></item>
95   - <item name=".py" icon="file_tree/file_tree.png" css="page_white_code" caption="Python file"><![CDATA[]]></item>
96   - <item name=".php" icon="file_tree/file_tree.png" css="page_white_php" caption="PHP file"><![CDATA[<?php
  85 + <item value="css" icon="css.png" caption="CSS file"><![CDATA[]]></item>
  86 + <item value="scss" icon="css.png" caption="SCSS file"><![CDATA[]]></item>
  87 + <item value="svg" icon="page_white_picture.png" caption="SVG file"><![CDATA[]]></item>
  88 + <item value="py" icon="script_code.png" caption="Python file"><![CDATA[]]></item>
  89 + <item value="php" icon="page_white_php.png" caption="PHP file"><![CDATA[<?php
97 90
98 91 ?>]]></item>
99   - <item name=".rb" icon="file_tree/file_tree.png" css="page_white_ruby" caption="Ruby file"><![CDATA[]]></item>
100   - <item name=".mli" icon="file_tree/file_tree.png" css="page_white_code" caption="OCaml file"><![CDATA[]]></item>
101   - <item name=".clj" icon="file_tree/file_tree.png" css="page_white_code" caption="Clojure file"><![CDATA[]]></item>
102   - <item name=".md" icon="file_tree/file_tree.png" css="page_white_text" caption="Markdown"><![CDATA[]]></item>
103   - <item name=".js" icon="file_tree/file_tree.png" css="page_white_code" caption="Express file"><![CDATA[// *******************************************************
  92 + <item value="rb" icon="page_white_ruby.png" caption="Ruby file"><![CDATA[]]></item>
  93 + <item value="mli" icon="page_white_code.png" caption="OCaml file"><![CDATA[]]></item>
  94 + <item value="clj" icon="page_white_code.png" caption="Clojure file"><![CDATA[]]></item>
  95 + <item value="md" icon="page_white_text.png" caption="Markdown"><![CDATA[]]></item>
  96 + <item value="js" icon="page_white_code.png" caption="Express file"><![CDATA[// *******************************************************
104 97 // expressjs template
105 98 //
106 99 // assumes: npm install express
@@ -132,7 +125,7 @@ app.configure('production', function(){
132 125 });
133 126 // *******************************************************
134 127 ]]></item>
135   - <item name=".js" icon="file_tree/file_tree.png" css="page_white_code" caption="Node.js web server"><![CDATA[var http = require('http');
  128 + <item value="js" icon="page_white_code.png" caption="Node.js web server"><![CDATA[var http = require('http');
136 129 http.createServer(function (req, res) {
137 130 res.writeHead(200, {'Content-Type': 'text/plain'});
138 131 res.end('Hello World from Cloud9\n');
4 plugins-client/ext.openfiles/openfiles.xml
@@ -45,8 +45,8 @@
45 45 skin = "tree">
46 46 <a:each match="[file]" sort="[@name]" sort-method="filesort">
47 47 <a:caption match="[@name]" value="{([../@changed] == 1 ? '*' : '') + [.] + (cbShowFiles.checked ? ' - ' + [../@path].split('/').slice(-2).join('/') : '')}" />
48   - <a:css match="[project|file|folder]" value="{require('core/util').getFileIcon(%[.])}" />
49   - <a:icon match="[project|file|folder]" value="{require('core/ide').staticPrefix}/ext/main/style/icons/file_tree/file_tree.png" />
  48 + <a:icon match="[folder|project]" value="folder.png" />
  49 + <a:icon match="[file]" value="{require('core/util').getFileIcon(%[.])}" />
50 50 </a:each>
51 51 <a:remove match="[file|folder]" />
52 52 </a:list>
7 plugins-client/ext.save/save.xml
@@ -101,7 +101,12 @@
101 101 match = "[folder]"
102 102 get = "{location.host &amp;&amp; davProject.readdir([@path])}" />
103 103 <a:caption match="[@name]" />
104   - <a:css match="[project|file|folder]" value="{require('core/util').getFileIcon(%[.])}" />
  104 + <a:icon
  105 + match = "[folder]"
  106 + value = "folder.png" />
  107 + <a:icon
  108 + match = "[file]"
  109 + value = "{require('core/util').getFileIcon(%[.])}" />
105 110 <a:css match="[file]" value="file_item"></a:css>
106 111 </a:each>
107 112 <a:add type="folder" get="{davProject.mkdir([@path], 'New Folder')}" />
3  plugins-client/ext.tree/tree.xml
@@ -38,10 +38,11 @@
38 38 <a:each match="[project|file|folder]" sort="[@name]" sort-method="filesort">
39 39 <a:insert match="[folder]" get="{davProject.readdir(%[.].getAttribute('path'))}" />
40 40 <a:caption match="[@name]" value="{([../@changed] == 1 ? '*' : '') + [.]}" />
  41 + <a:icon match="[folder|project]" value="folder.png" />
41 42 <a:selectable match="[folder|file[not(@type='fileupload')]]" />
42 43 <a:icon match="[file[@type='fileupload']]" value="file-tree-load-spinner.gif" />
43 44 <a:css match="[file[@type='fileupload']]" value="fileupload" />
44   - <a:css match="[project|file|folder]" value="{require('core/util').getFileIcon(%[.])}" />
  45 + <a:icon match="[file]" value="{require('core/util').getFileIcon(%[.])}" />
45 46 </a:each>
46 47
47 48 <a:add type="folder" get="{davProject.mkdir(%[.].getAttribute('path'), 'New Folder')}" />
30 plugins-client/ext.zen/zen.js
@@ -157,20 +157,12 @@ module.exports = ext.register("ext/zen/zen", {
157 157 page.appendChild(button);
158 158 });
159 159
160   - ide.addEventListener("enterzen", function() {
161   - vbMain.parentNode.appendChild(new apf.vbox({
162   - anchors: "0 0 0 0",
163   - id: "vbZen",
164   - "class": "vbZen",
165   - visible: false
166   - }));
167   -
168   - vbZen.addEventListener("resize", function(e) {
169   - if (_self.isFocused) {
170   - _self.calculatePositions();
171   - }
172   - });
173   - });
  160 + vbMain.parentNode.appendChild(new apf.vbox({
  161 + anchors: "0 0 0 0",
  162 + id: "vbZen",
  163 + "class": "vbZen",
  164 + visible: false
  165 + }));
174 166
175 167 setTimeout(function() {
176 168 _self.updateButtonPosition();
@@ -179,6 +171,12 @@ module.exports = ext.register("ext/zen/zen", {
179 171 this.animateZen = document.getElementById("animateZen");
180 172 this.animateZenPosition = document.getElementById("animateZenPosition");
181 173
  174 + vbZen.addEventListener("resize", function(e) {
  175 + if (_self.isFocused) {
  176 + _self.calculatePositions();
  177 + }
  178 + });
  179 +
182 180 ide.addEventListener("exitfullscreen", function() {
183 181 _self.escapeFromZenMode(false, true);
184 182 });
@@ -303,8 +301,6 @@ module.exports = ext.register("ext/zen/zen", {
303 301 * @param {boolean} slow Whether to slow down the animation
304 302 */
305 303 enterIntoZenMode : function(slow) {
306   - ide.dispatchEvent("enterzen");
307   -
308 304 var _self = this;
309 305
310 306 var activeElement = apf.document.activeElement;
@@ -385,8 +381,6 @@ module.exports = ext.register("ext/zen/zen", {
385 381 if (this.isFocused === false)
386 382 return;
387 383
388   - ide.dispatchEvent("escapezen");
389   -
390 384 var _self = this;
391 385
392 386 var activeElement = apf.document.activeElement;

0 comments on commit a63a837

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