adding other ng prefixes to be added and test to jq(), fixing documentation error by adding @module ng, changing @element to be any

Author: Michel Boudreau

src/Angular.js

@@ -902,9 +902,10 @@ var csp = function() {
 
 /**
  * @ngdoc directive
+ * @module ng
  * @name ngJq
  *
- * @element html
+ * @element ANY
  * @param {string=} the name of the library available under `window`
  * to be used for angular.element
  * @description
@@ -913,7 +914,7 @@ var csp = function() {
  * the jquery variable under window (eg. jQuery).
  *
  * Since this directive is global for the angular library, it is recommended
- * that it's added to the top-most HTML element, but it is not mandatory.
+ * that it's added to the same element as ng-app or the HTML element, but it is not mandatory.
  *
  * @example
  * This example shows how to force jqLite using the `ngJq` directive to the `html` tag.
@@ -937,12 +938,17 @@ var csp = function() {
  */
 var jq = function() {
   if (isDefined(jq.name_)) return jq.name_;
+	var el;
+	var i, ii = ngAttrPrefixes.length;
+	for (i = 0; i < ii; ++i) {
+		if (el = document.querySelector('[' + ngAttrPrefixes[i].replace(':', '\\:') + 'jq]')) {
+			break;
+		}
+	}
 
-  var el = document.querySelector('[ng-jq]') || document.querySelector('[data-ng-jq]');
   var name;
-
   if (el) {
-    name = el.getAttribute('ng-jq') || el.getAttribute('data-ng-jq') || '';
+    name = getNgAttribute(el, "jq") || '';
   }
 
   return (jq.name_ = name);

test/AngularSpec.js

@@ -616,7 +616,7 @@ describe('angular', function() {
 
 
   describe('jq', function() {
-    var element, fakeQuery;
+    var element;
 
     beforeEach(function() {
       element = document.createElement('html');
@@ -648,22 +648,59 @@ describe('angular', function() {
       expect(document.querySelector).toHaveBeenCalledWith('[data-ng-jq]');
     });
 
-    it('should return "jquery" when jq is enabled manually via [ng-jq] with value "jquery"', function() {
+    it('should return empty string when jq is enabled manually via [x-ng-jq] with empty string', function() {
+      element.setAttribute('x-ng-jq', '');
+      spyOn(document, 'querySelector').andCallFake(function(selector) {
+        if (selector == '[x-ng-jq]') return element;
+      });
+      expect(jq()).toBe('');
+      expect(document.querySelector).toHaveBeenCalledWith('[x-ng-jq]');
+    });
+
+    it('should return empty string when jq is enabled manually via [ng:jq] with empty string', function() {
+      element.setAttribute('ng:jq', '');
+      spyOn(document, 'querySelector').andCallFake(function(selector) {
+        if (selector == '[ng\\:jq]') return element;
+      });
+      expect(jq()).toBe('');
+      expect(document.querySelector).toHaveBeenCalledWith('[ng\\:jq]');
+    });
+
+    it('should return "jquery" when jq is enabled manually via [ng-jq] with value "jQuery"', function() {
       element.setAttribute('ng-jq', 'jQuery');
       spyOn(document, 'querySelector').andCallFake(function(selector) {
         if (selector == '[ng-jq]') return element;
       });
       expect(jq()).toBe('jQuery');
+      expect(document.querySelector).toHaveBeenCalledWith('[ng-jq]');
     });
 
-    it('should return "jquery" when jq is enabled manually via [data-ng-jq] with value "jquery"', function() {
+    it('should return "jquery" when jq is enabled manually via [data-ng-jq] with value "jQuery"', function() {
       element.setAttribute('data-ng-jq', 'jQuery');
       spyOn(document, 'querySelector').andCallFake(function(selector) {
         if (selector == '[data-ng-jq]') return element;
       });
       expect(jq()).toBe('jQuery');
       expect(document.querySelector).toHaveBeenCalledWith('[data-ng-jq]');
     });
+
+    it('should return "jquery" when jq is enabled manually via [x-ng-jq] with value "jQuery"', function() {
+      element.setAttribute('x-ng-jq', 'jQuery');
+      spyOn(document, 'querySelector').andCallFake(function(selector) {
+        if (selector == '[x-ng-jq]') return element;
+      });
+      expect(jq()).toBe('jQuery');
+      expect(document.querySelector).toHaveBeenCalledWith('[x-ng-jq]');
+    });
+
+    it('should return "jquery" when jq is enabled manually via [ng:jq] with value "jQuery"', function() {
+      element.setAttribute('ng:jq', 'jQuery');
+      spyOn(document, 'querySelector').andCallFake(function(selector) {
+        if (selector == '[ng\\:jq]') return element;
+      });
+      expect(jq()).toBe('jQuery');
+      expect(document.querySelector).toHaveBeenCalledWith('[ng\\:jq]');
+    });
   });