From d3bd74e33d8ac7934af07cacc4054aeab7f055ea Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Sun, 16 Aug 2015 17:28:36 -0700 Subject: [PATCH] The first tests are running --- configs/client-default.js | 5 ++++- node_modules/ace_tree/lib/ace_tree/data_provider.js | 2 +- .../c9.ide.layout.classic/themes/default-dark-gray.less | 3 +++ plugins/c9.ide.layout.classic/themes/default-dark.less | 3 +++ .../c9.ide.layout.classic/themes/default-flat-light.less | 3 +++ .../c9.ide.layout.classic/themes/default-light-gray.less | 3 +++ plugins/c9.ide.layout.classic/themes/default-light.less | 3 +++ plugins/c9.ide.layout.classic/themes/flat-light.less | 2 +- plugins/c9.ide.tree/style.css | 8 ++++---- plugins/c9.ide.ui/widgets.list.js | 2 +- 10 files changed, 26 insertions(+), 8 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index 906da7e1..78bf58b2 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -391,7 +391,10 @@ module.exports = function(options) { "plugins/c9.ide.test/test", "plugins/c9.ide.test/testpanel", "plugins/c9.ide.test/testrunner", - "plugins/c9.ide.test/all", + { + packagePath: "plugins/c9.ide.test/all", + staticPrefix: staticPrefix + "/plugins/c9.ide.test" + }, "plugins/c9.ide.test/results", // "plugins/c9.ide.test/codecoverage", diff --git a/node_modules/ace_tree/lib/ace_tree/data_provider.js b/node_modules/ace_tree/lib/ace_tree/data_provider.js index 1f4926c3..e2afa93f 100644 --- a/node_modules/ace_tree/lib/ace_tree/data_provider.js +++ b/node_modules/ace_tree/lib/ace_tree/data_provider.js @@ -226,7 +226,7 @@ var DataProvider = function(root) { this.hasChildren = function(node) { if (node.children) return node.children.length !== 0; - return node.map + return node.map || node.status === "pending" || node.items && node.items.length; }; diff --git a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less index 70d4e804..eb6eafe2 100644 --- a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less +++ b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less @@ -1043,6 +1043,9 @@ @tree-selected-color-alternative: @selected-focus-color; @tree-folder-icon-alternative: "folder_alternative.png"; +@tree-extrainfo-color: rgb(92, 92, 92); +@tree-focus-selected-extrainfo-color: #ccc; + // Open Files @openfiles-icon-margin: 1px 3px 0 3px; @openfiles-caption-padding: -2px 2px 0 3px; diff --git a/plugins/c9.ide.layout.classic/themes/default-dark.less b/plugins/c9.ide.layout.classic/themes/default-dark.less index 1dcecaa3..ab439bfe 100644 --- a/plugins/c9.ide.layout.classic/themes/default-dark.less +++ b/plugins/c9.ide.layout.classic/themes/default-dark.less @@ -1043,6 +1043,9 @@ @tree-selected-color-alternative: @selected-focus-color; @tree-folder-icon-alternative: "folder_alternative.png"; +@tree-extrainfo-color: rgb(92, 92, 92); +@tree-focus-selected-extrainfo-color: #ccc; + // Open Files @openfiles-icon-margin: 1px 3px 0 3px; @openfiles-caption-padding: -2px 2px 0 3px; diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-light.less b/plugins/c9.ide.layout.classic/themes/default-flat-light.less index 28ee6985..bab5f9f8 100644 --- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less @@ -1043,6 +1043,9 @@ @tree-selected-color-alternative: @selected-focus-color; @tree-folder-icon-alternative: @tree-folder-icon; +@tree-extrainfo-color: #CCC; +@tree-focus-selected-extrainfo-color: #CCC; + // Open Files @openfiles-icon-margin: -2px 2px 0 3px; @openfiles-caption-padding: -3px 2px 0 3px; diff --git a/plugins/c9.ide.layout.classic/themes/default-light-gray.less b/plugins/c9.ide.layout.classic/themes/default-light-gray.less index 59a0cb01..4fa66c6e 100644 --- a/plugins/c9.ide.layout.classic/themes/default-light-gray.less +++ b/plugins/c9.ide.layout.classic/themes/default-light-gray.less @@ -1043,6 +1043,9 @@ @tree-selected-color-alternative: @selected-focus-color; @tree-folder-icon-alternative: @tree-folder-icon; +@tree-extrainfo-color: rgb(92, 92, 92); +@tree-focus-selected-extrainfo-color: #ccc; + // Open Files @openfiles-icon-margin: 1px 3px 0 3px; @openfiles-caption-padding: -2px 2px 0 3px; diff --git a/plugins/c9.ide.layout.classic/themes/default-light.less b/plugins/c9.ide.layout.classic/themes/default-light.less index 2b746ca5..94ac2d38 100644 --- a/plugins/c9.ide.layout.classic/themes/default-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-light.less @@ -1043,6 +1043,9 @@ @tree-selected-color-alternative: @selected-focus-color; @tree-folder-icon-alternative: @tree-folder-icon; +@tree-extrainfo-color: rgb(92, 92, 92); +@tree-focus-selected-extrainfo-color: #ccc; + // Open Files @openfiles-icon-margin: 1px 3px 0 3px; @openfiles-caption-padding: -2px 2px 0 3px; diff --git a/plugins/c9.ide.layout.classic/themes/flat-light.less b/plugins/c9.ide.layout.classic/themes/flat-light.less index f4248dcc..3c13e479 100644 --- a/plugins/c9.ide.layout.classic/themes/flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/flat-light.less @@ -376,7 +376,7 @@ padding-right: 0; } -.filetree.ace_tree_focus .selected .extrainfo{ +.ace_tree.ace_tree_focus .selected .extrainfo{ color: #FFFFFF; .font-smoothing(true); } diff --git a/plugins/c9.ide.tree/style.css b/plugins/c9.ide.tree/style.css index 678927d2..ac678533 100644 --- a/plugins/c9.ide.tree/style.css +++ b/plugins/c9.ide.tree/style.css @@ -107,11 +107,11 @@ .filetree .favorite{ opacity : 0.5; } -.filetree .extrainfo{ - color : rgb(92, 92, 92); +.ace_tree .extrainfo{ + color : @tree-extrainfo-color; } -.filetree.ace_tree_focus .selected .extrainfo{ - color : #CCCCCC; +.ace_tree.ace_tree_focus .selected .extrainfo{ + color : @tree-focus-selected-extrainfo-color; } .filetree .tree-row.dragAppendUpload .filetree-icon { diff --git a/plugins/c9.ide.ui/widgets.list.js b/plugins/c9.ide.ui/widgets.list.js index 66946607..1f29e5d3 100644 --- a/plugins/c9.ide.ui/widgets.list.js +++ b/plugins/c9.ide.ui/widgets.list.js @@ -381,7 +381,7 @@ define(function(require, exports, module) { * */ get sort(){ return model.sort; }, - set sort(fn){ debugger; + set sort(fn){ model.$sortNodes = fn ? true : false; model.$sorted = fn ? true : false; model.sort = fn;