brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [22/50] [abbrv] brooklyn-ui git commit: tiny tidies, fix test and whitespace
Date Mon, 01 Feb 2016 17:51:55 GMT
tiny tidies, fix test and whitespace


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/eae8af53
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/eae8af53
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/eae8af53

Branch: refs/heads/0.5.0
Commit: eae8af53d76571f2e813d21663107958ed9eeaed
Parents: 2efd87e
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Tue Dec 4 09:17:15 2012 -0600
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Tue Dec 4 09:19:10 2012 -0600

----------------------------------------------------------------------
 .../jsgui/src/main/webapp/assets/tpl/apps/page.html |  4 +++-
 .../main/webapp/assets/tpl/home/applications.html   |  4 +++-
 .../javascript/specs/view/entity-activities-spec.js | 16 ----------------
 3 files changed, 6 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/eae8af53/usage/jsgui/src/main/webapp/assets/tpl/apps/page.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/apps/page.html b/usage/jsgui/src/main/webapp/assets/tpl/apps/page.html
index 83d69b1..4a20a87 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/apps/page.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/apps/page.html
@@ -15,4 +15,6 @@
 
 	<div class="span8" id="details"></div>
 </div>
-<div id="modal-container" class="add-app"></div>
\ No newline at end of file
+<div class="add-app">
+    <div id="modal-container"></div>
+</div>

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/eae8af53/usage/jsgui/src/main/webapp/assets/tpl/home/applications.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/home/applications.html b/usage/jsgui/src/main/webapp/assets/tpl/home/applications.html
index e95221d..f94a365 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/home/applications.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/home/applications.html
@@ -36,4 +36,6 @@
     </div>
 </div></div>
 
-<div id="modal-container" class="add-app"></div>
+<div class="add-app">
+    <div id="modal-container"></div>
+</div>

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/eae8af53/usage/jsgui/src/test/javascript/specs/view/entity-activities-spec.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/javascript/specs/view/entity-activities-spec.js b/usage/jsgui/src/test/javascript/specs/view/entity-activities-spec.js
index 3b7db4c..9c233ea 100644
--- a/usage/jsgui/src/test/javascript/specs/view/entity-activities-spec.js
+++ b/usage/jsgui/src/test/javascript/specs/view/entity-activities-spec.js
@@ -13,20 +13,4 @@ define([
         })
     })
 
-    describe("view/entity-activity details modal view", function () {
-        var tasks, view
-
-        beforeEach(function () {
-            tasks = new TaskSummary.Collection
-            tasks.url = "fixtures/task-summary-list.json"
-            tasks.fetch({async:false})
-            view = new ActivityView.Modal({
-                model:tasks.at(0)
-            }).render()
-        })
-
-        it("renders as a bootstrap modal", function () {
-            expect(view.$el.is("div.modal")).toBe(true)
-        })
-    })
 })
\ No newline at end of file


Mime
View raw message