aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Marek2013-07-24 21:20:39 +0200
committerJeff Cross2013-07-31 15:50:12 -0700
commit3fdbe81a337c39027929c415e719493755cd8583 (patch)
treec2d81d085d6464f0a745f1305614cbf4ac7328a2
parentca3e0c8ce5e1d6fa18346800023d3864c1d83a81 (diff)
downloadangular.js-3fdbe81a337c39027929c415e719493755cd8583.tar.bz2
feat(scenario): expose jQuery for usage outside of angular scenario
The global jQuery reference is removed by angular scenario and only a local scoped reference is kept. To make jQuery available for other code, a new reference angular.scenario.jQuery is added.
-rw-r--r--src/ngScenario/Scenario.js5
-rw-r--r--test/ngScenario/ScenarioSpec.js12
2 files changed, 17 insertions, 0 deletions
diff --git a/src/ngScenario/Scenario.js b/src/ngScenario/Scenario.js
index 4d848f2c..ff5f3470 100644
--- a/src/ngScenario/Scenario.js
+++ b/src/ngScenario/Scenario.js
@@ -10,6 +10,11 @@
angular.scenario = angular.scenario || {};
/**
+ * Expose jQuery (e.g. for custom dsl extensions).
+ */
+angular.scenario.jQuery = _jQuery;
+
+/**
* Defines a new output format.
*
* @param {string} name the name of the new output format
diff --git a/test/ngScenario/ScenarioSpec.js b/test/ngScenario/ScenarioSpec.js
index cc2efd1e..898075cb 100644
--- a/test/ngScenario/ScenarioSpec.js
+++ b/test/ngScenario/ScenarioSpec.js
@@ -29,4 +29,16 @@ describe("ScenarioSpec: Compilation", function() {
expect(jqLite(element).text()).toEqual('123');
}));
});
+
+ describe('jQuery', function () {
+ it('should exist on the angular.scenario object', function () {
+ expect(angular.scenario.jQuery).toBeDefined();
+ });
+
+ it('should have common jQuery methods', function () {
+ var jQuery = angular.scenario.jQuery;
+ expect(typeof jQuery).toEqual('function');
+ expect(typeof jQuery('<div></div>').html).toEqual('function');
+ })
+ });
});