You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/12/09 11:59:55 UTC
[1/2] incubator-brooklyn git commit: Adds "None" location to
arguments of start effector
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master f249da3de -> 566fd49ab
Adds "None" location to arguments of start effector
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6edeae6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6edeae6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6edeae6e
Branch: refs/heads/master
Commit: 6edeae6e3c85becb19deedbbe6dc8563c3e8984f
Parents: 6db0328
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Dec 9 09:33:21 2014 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Tue Dec 9 09:33:21 2014 +0000
----------------------------------------------------------------------
usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js | 5 +++++
.../src/test/javascript/specs/view/effector-invoke-spec.js | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6edeae6e/usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js b/usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js
index 02006cd..bc22775 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js
@@ -88,6 +88,11 @@ define([
rowId : 0
}))
var $selectLocations = container.find('#select-location')
+ .append(this.locationOptionTemplate({
+ id: "",
+ name: "None"
+ }))
+ .append("<option disabled>------</option>");
this.locations.each(function(aLocation) {
var $option = that.locationOptionTemplate({
id:aLocation.id,
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6edeae6e/usage/jsgui/src/test/javascript/specs/view/effector-invoke-spec.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/javascript/specs/view/effector-invoke-spec.js b/usage/jsgui/src/test/javascript/specs/view/effector-invoke-spec.js
index 178aca6..42055af 100644
--- a/usage/jsgui/src/test/javascript/specs/view/effector-invoke-spec.js
+++ b/usage/jsgui/src/test/javascript/specs/view/effector-invoke-spec.js
@@ -43,6 +43,11 @@ define([
describe("view/effector-invoke", function () {
// render and keep the reference to the view
modalView.render()
+
+ // Select the third item in the option list rather than the "None" and
+ // horizontal bar placeholders.
+ modalView.$("#select-location option:eq(2)").attr("selected", "selected");
+
it("must render a bootstrap modal", function () {
expect(modalView.$(".modal-header").length).toBe(1)
expect(modalView.$(".modal-body").length).toBe(1)
[2/2] incubator-brooklyn git commit: This closes #378
Posted by al...@apache.org.
This closes #378
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/566fd49a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/566fd49a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/566fd49a
Branch: refs/heads/master
Commit: 566fd49ab06a3cecdbe0d447bf8c906061860ee6
Parents: f249da3 6edeae6
Author: Aled Sage <al...@gmail.com>
Authored: Tue Dec 9 10:59:36 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Dec 9 10:59:36 2014 +0000
----------------------------------------------------------------------
usage/jsgui/src/main/webapp/assets/js/view/effector-invoke.js | 5 +++++
.../src/test/javascript/specs/view/effector-invoke-spec.js | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------