Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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 with 57 additions and 109 deletions.
  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
View
@@ -1,13 +0,0 @@
-var args = process.argv.slice(2),
- fileIn = args[0],
- fileOut = args[1],
- fs = require("fs");
-
- fs.readFile(fileIn, "utf8", function(err, json) {
- if (err) {
- console.error(err);
- process.exit(1);
- }
-
- fs.writeFileSync(fileOut, JSON.stringify(JSON.parse(json), null));
- });
23 plugins-client/cloud9.core/www/core/util.js
View
@@ -131,13 +131,12 @@ exports.removeInteractive = function (amlNode) {
}
};
-// map mime-type to css class; see ext.main/style/icons/file_icons/sprite
var SupportedIcons = {
- "application/xhtml+xml":"html",
- "text/css": "css",
- "text/x-scss": "css",
- "text/x-sass": "css",
- "text/html":"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":"image",
"application/xml":"page_white_code_red",
@@ -234,13 +233,15 @@ var contentTypes = {
};
exports.getFileIcon = function(xmlNode) {
- if (xmlNode.getAttribute("type") === "folder")
- return "folder";
-
var name = xmlNode.getAttribute("name");
- var ext = name !== null ? name.split(".").pop().toLowerCase() : "text/plain";
+ var icon = "page_white_text";
+ var ext;
- return SupportedIcons[contentTypes[ext]] || "page_white_text";
+ if (name) {
+ ext = name.split(".").pop().toLowerCase();
+ icon = SupportedIcons[contentTypes[ext]] || "page_white_text";
+ }
+ return icon + ".png";
};
0  ...ins-client/ext.main/style/icons/file_tree/css.png → plugins-client/ext.main/style/icons/css.png
View
File renamed without changes
BIN  plugins-client/ext.main/style/icons/file_tree/file_tree.png
View
Deleted file not rendered
BIN  plugins-client/ext.main/style/icons/file_tree/folder.png
View
Deleted file not rendered
BIN  plugins-client/ext.main/style/icons/folder.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0  ...ns-client/ext.main/style/icons/file_tree/html.png → plugins-client/ext.main/style/icons/html.png
View
File renamed without changes
0  ...s-client/ext.main/style/icons/file_tree/image.png → plugins-client/ext.main/style/icons/image.png
View
File renamed without changes
0  ...ent/ext.main/style/icons/file_tree/page_white.png → plugins-client/ext.main/style/icons/page_white.png
View
File renamed without changes
0  ...main/style/icons/file_tree/page_white_acrobat.png → ...lient/ext.main/style/icons/page_white_acrobat.png
View
File renamed without changes
0  ...style/icons/file_tree/page_white_actionscript.png → .../ext.main/style/icons/page_white_actionscript.png
View
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_add.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0  ...t/ext.main/style/icons/file_tree/page_white_c.png → plugins-client/ext.main/style/icons/page_white_c.png
View
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_camera.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  plugins-client/ext.main/style/icons/page_white_cd.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0  ...xt.main/style/icons/file_tree/page_white_code.png → ...s-client/ext.main/style/icons/page_white_code.png
View
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
View
File renamed without changes
0  ...n/style/icons/file_tree/page_white_coldfusion.png → ...nt/ext.main/style/icons/page_white_coldfusion.png
View
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_compressed.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  plugins-client/ext.main/style/icons/page_white_copy.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0  ...in/style/icons/file_tree/page_white_cplusplus.png → ...ent/ext.main/style/icons/page_white_cplusplus.png
View
File renamed without changes
0  ....main/style/icons/file_tree/page_white_csharp.png → ...client/ext.main/style/icons/page_white_csharp.png
View
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
View
File renamed without changes
BIN  plugins-client/ext.main/style/icons/page_white_database.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  plugins-client/ext.main/style/icons/page_white_delete.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  plugins-client/ext.main/style/icons/page_white_dvd.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  plugins-client/ext.main/style/icons/page_white_edit.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  plugins-client/ext.main/style/icons/page_white_error.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_excel.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_find.png
View
Diff not rendered
0  ...t.main/style/icons/file_tree/page_white_flash.png → ...-client/ext.main/style/icons/page_white_flash.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_freehand.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_gear.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_get.png
View
Diff not rendered
0  .../ext.main/style/icons/file_tree/page_white_go.png → ...ins-client/ext.main/style/icons/page_white_go.png
View
Diff not rendered
0  ...t/ext.main/style/icons/file_tree/page_white_h.png → plugins-client/ext.main/style/icons/page_white_h.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_horizontal.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_key.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_lightning.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_link.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_magnify.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_medal.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_office.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_paint.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_paintbrush.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_paste.png
View
Diff not rendered
0  ...ext.main/style/icons/file_tree/page_white_php.png → ...ns-client/ext.main/style/icons/page_white_php.png
View
Diff not rendered
0  ...main/style/icons/file_tree/page_white_picture.png → ...lient/ext.main/style/icons/page_white_picture.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_powerpoint.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_put.png
View
Diff not rendered
0  ...xt.main/style/icons/file_tree/page_white_ruby.png → ...s-client/ext.main/style/icons/page_white_ruby.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_stack.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_star.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_swoosh.png
View
Diff not rendered
0  ...xt.main/style/icons/file_tree/page_white_text.png → ...s-client/ext.main/style/icons/page_white_text.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_text_width.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_tux.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_vector.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_visualstudio.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_width.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_word.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_world.png
View
Diff not rendered
0  ....main/style/icons/file_tree/page_white_wrench.png → ...client/ext.main/style/icons/page_white_wrench.png
View
Diff not rendered
BIN  plugins-client/ext.main/style/icons/page_white_zip.png
View
Diff not rendered
37 plugins-client/ext.main/style/skins.xml
View
@@ -12081,7 +12081,6 @@
.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;
@@ -12117,22 +12116,16 @@
}
.filemgr-tree .item LABEL .caption {
- width: 123px;
font-family : Tahoma, Arial;
font-size : 11px;
display:block;
position:relative;
overflow:hidden;
height:16px;
- padding:1px 0 0 20px;
+ padding:1px 0 0 23px;
text-decoration:none;
white-space: nowrap;
}
-
- .filemgr-tree .folder .item label .caption {
- top: -2px;
- }
-
.filemgr-tree.not(treeOutline) .item LABEL .caption {
color : #101010;
}
@@ -12275,39 +12268,13 @@
.filemgr-tree .syncing_added, .filemgr-tree .syncing_added.selected{
opacity : 0.5;
}
-
- .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 20px;
+ padding:2px 0 0 23px;
}
#txt_rename {
49 plugins-client/ext.newresource/newresource.xml
View
@@ -22,18 +22,11 @@
class = "noscrollbar"
scrollbar = "sbShared 12 12 55"
each = "item"
- eachvalue = "[@name]"
+ eachvalue = "[@value]"
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"
@@ -52,9 +45,9 @@
<a:model id="mdlFileTemplates">
<templates>
- <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";
+ <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";
require("./support/paths");
var assert = require("assert");
@@ -71,9 +64,9 @@ module.exports = {
if (typeof module !== "undefined" && module === require.main) {
require("asyncjs").test.testcase(module.exports).exec()
}]]></item>
- <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>
+ <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>
<html>
<head>
<title> </title>
@@ -83,24 +76,24 @@ if (typeof module !== "undefined" && module === require.main) {
</body>
</html>
]]></item>
- <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";
+ <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";
let $message := "Hello World!"
return <results>
<message>{$message}</message>
</results>]]></item>
- <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 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>
- <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[// *******************************************************
+ <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[// *******************************************************
// expressjs template
//
// assumes: npm install express
@@ -132,7 +125,7 @@ app.configure('production', function(){
});
// *******************************************************
]]></item>
- <item name=".js" icon="file_tree/file_tree.png" css="page_white_code" caption="Node.js web server"><![CDATA[var http = require('http');
+ <item value="js" icon="page_white_code.png" 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');
4 plugins-client/ext.openfiles/openfiles.xml
View
@@ -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: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:icon match="[folder|project]" value="folder.png" />
+ <a:icon match="[file]" value="{require('core/util').getFileIcon(%[.])}" />
</a:each>
<a:remove match="[file|folder]" />
</a:list>
7 plugins-client/ext.save/save.xml
View
@@ -101,7 +101,12 @@
match = "[folder]"
get = "{location.host &amp;&amp; davProject.readdir([@path])}" />
<a:caption match="[@name]" />
- <a:css match="[project|file|folder]" value="{require('core/util').getFileIcon(%[.])}" />
+ <a:icon
+ match = "[folder]"
+ value = "folder.png" />
+ <a:icon
+ match = "[file]"
+ 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')}" />
3  plugins-client/ext.tree/tree.xml
View
@@ -38,10 +38,11 @@
<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:css match="[project|file|folder]" value="{require('core/util').getFileIcon(%[.])}" />
+ <a:icon match="[file]" value="{require('core/util').getFileIcon(%[.])}" />
</a:each>
<a:add type="folder" get="{davProject.mkdir(%[.].getAttribute('path'), 'New Folder')}" />
30 plugins-client/ext.zen/zen.js
View
@@ -157,20 +157,12 @@ module.exports = ext.register("ext/zen/zen", {
page.appendChild(button);
});
- 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();
- }
- });
- });
+ vbMain.parentNode.appendChild(new apf.vbox({
+ anchors: "0 0 0 0",
+ id: "vbZen",
+ "class": "vbZen",
+ visible: false
+ }));
setTimeout(function() {
_self.updateButtonPosition();
@@ -179,6 +171,12 @@ 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);
});
@@ -303,8 +301,6 @@ 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;
@@ -385,8 +381,6 @@ 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.