Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRogelio Mita <rogeliomita@activitycentral.com>2013-09-11 01:37:00 (GMT)
committer Rogelio Mita <rogeliomita@activitycentral.com>2013-09-11 01:37:00 (GMT)
commit1b7342c0d6ce508c6d75e6a541d629b54627bffc (patch)
treea11b32b494b4af551da721d87a67f9840870d4b9
parentf086002dfe4a635afcd3d229889aef059fce707c (diff)
Popover for dependency input
-rw-r--r--webapp/coffee/dependency_input.coffee4
-rw-r--r--webapp/js_tests/spec/DependencyInputSpec.js5
-rw-r--r--webapp/js_tests/spec/coffee/DependencyInputSpec.coffee3
-rw-r--r--webapp/webapp/static/js/dependency_input.js4
4 files changed, 13 insertions, 3 deletions
diff --git a/webapp/coffee/dependency_input.coffee b/webapp/coffee/dependency_input.coffee
index 13691d6..a5d3d1e 100644
--- a/webapp/coffee/dependency_input.coffee
+++ b/webapp/coffee/dependency_input.coffee
@@ -21,6 +21,10 @@ class DependencyInput
Mustache.tags = ['[[', ']]']
widget = jQuery(Mustache.render @template, context)
input = $(widget[3])
+ input.popover({
+ title: "title",
+ content: "content"
+ })
return widget
diff --git a/webapp/js_tests/spec/DependencyInputSpec.js b/webapp/js_tests/spec/DependencyInputSpec.js
index 10a95f9..28865be 100644
--- a/webapp/js_tests/spec/DependencyInputSpec.js
+++ b/webapp/js_tests/spec/DependencyInputSpec.js
@@ -20,7 +20,7 @@
});
return it("should respond with popover on click", function() {
var container, dependency_input, field_order, group_order, input, widget;
- setFixtures("<div id='container'></div>");
+ setFixtures('<div id="container"></div>');
container = $('#container');
group_order = "0";
field_order = "0";
@@ -28,7 +28,8 @@
widget = dependency_input.render();
container.append(widget);
input = container.find("input.dependence_value");
- return input.click();
+ input.click();
+ return expect(container).toContain(".popover");
});
});
diff --git a/webapp/js_tests/spec/coffee/DependencyInputSpec.coffee b/webapp/js_tests/spec/coffee/DependencyInputSpec.coffee
index 28a47c5..d5b4d21 100644
--- a/webapp/js_tests/spec/coffee/DependencyInputSpec.coffee
+++ b/webapp/js_tests/spec/coffee/DependencyInputSpec.coffee
@@ -33,7 +33,7 @@ describe "DependencyInput", ->
expect(dependency_input.render()).toBe(expected)
it "should respond with popover on click", ->
- setFixtures("<div id='container'></div>")
+ setFixtures('<div id="container"></div>');
container = $('#container');
group_order = "0"
@@ -44,3 +44,4 @@ describe "DependencyInput", ->
input = container.find("input.dependence_value")
input.click()
+ expect(container).toContain(".popover")
diff --git a/webapp/webapp/static/js/dependency_input.js b/webapp/webapp/static/js/dependency_input.js
index ea948b9..a97b1da 100644
--- a/webapp/webapp/static/js/dependency_input.js
+++ b/webapp/webapp/static/js/dependency_input.js
@@ -20,6 +20,10 @@
Mustache.tags = ['[[', ']]'];
widget = jQuery(Mustache.render(this.template, context));
input = $(widget[3]);
+ input.popover({
+ title: "title",
+ content: "content"
+ });
return widget;
};