diff options
| -rw-r--r-- | src/Browser.js | 1 | ||||
| -rw-r--r-- | src/services.js | 10 | ||||
| -rw-r--r-- | test/BrowserSpecs.js | 1 | ||||
| -rw-r--r-- | test/servicesSpec.js | 8 |
4 files changed, 9 insertions, 11 deletions
diff --git a/src/Browser.js b/src/Browser.js index 2777dcda..3299540c 100644 --- a/src/Browser.js +++ b/src/Browser.js @@ -22,7 +22,6 @@ function Browser(location, document, head) { this.location = location; this.document = document; - this.body = jqLite(document[0].body); this.head = head; this.idCounter = 0; } diff --git a/src/services.js b/src/services.js index c9799b32..89cca6fc 100644 --- a/src/services.js +++ b/src/services.js @@ -75,8 +75,8 @@ angularService("$log", function($window){ }; }, {inject:['$window']}); -angularService("$hover", function(browser) { - var tooltip, self = this, error, width = 300, arrowWidth = 10; +angularService("$hover", function(browser, document) { + var tooltip, self = this, error, width = 300, arrowWidth = 10, body = jqLite(document[0].body);; browser.hover(function(element, show){ if (show && (error = element.attr(NG_EXCEPTION) || element.attr(NG_VALIDATION_ERROR))) { if (!tooltip) { @@ -89,9 +89,9 @@ angularService("$hover", function(browser) { tooltip.callout.append(tooltip.arrow); tooltip.callout.append(tooltip.title); tooltip.callout.append(tooltip.content); - self.$browser.body.append(tooltip.callout); + body.append(tooltip.callout); } - var docRect = self.$browser.body[0].getBoundingClientRect(), + var docRect = body[0].getBoundingClientRect(), elementRect = element[0].getBoundingClientRect(), leftSpace = docRect.right - elementRect.right - arrowWidth; tooltip.title.text(element.hasClass("ng-exception") ? "EXCEPTION:" : "Validation error..."); @@ -119,7 +119,7 @@ angularService("$hover", function(browser) { tooltip = null; } }); -}, {inject:['$browser']}); +}, {inject:['$browser', '$document']}); angularService("$invalidWidgets", function(){ var invalidWidgets = []; diff --git a/test/BrowserSpecs.js b/test/BrowserSpecs.js index a9f61a6b..48387b4d 100644 --- a/test/BrowserSpecs.js +++ b/test/BrowserSpecs.js @@ -4,7 +4,6 @@ describe('browser', function(){ beforeEach(function(){ location = {href:"http://server", hash:""}; - document = jqLite(window.document); head = { scripts: [], append: function(node){head.scripts.push(node);} diff --git a/test/servicesSpec.js b/test/servicesSpec.js index 90f3d12b..031c48f0 100644 --- a/test/servicesSpec.js +++ b/test/servicesSpec.js @@ -1,5 +1,5 @@ describe("service", function(){ - var scope, $xhrError, $log; + var scope, $xhrError, $log, mockServices; beforeEach(function(){ $xhrError = jasmine.createSpy('$xhr.error'); @@ -38,7 +38,7 @@ describe("service", function(){ function warn(){ logger+= 'warn;'; }; function info(){ logger+= 'info;'; }; function error(){ logger+= 'error;'; }; - var scope = createScope(null, angularService, {$window: {console:{log:log, warn:warn, info:info, error:error}}}); + var scope = createScope(null, angularService, {$window: {console:{log:log, warn:warn, info:info, error:error}}, $document:[{}]}); scope.$log.log(); scope.$log.warn(); scope.$log.info(); @@ -49,7 +49,7 @@ describe("service", function(){ it('should use console.log if other not present', function(){ var logger = ""; function log(){ logger+= 'log;'; }; - var scope = createScope(null, angularService, {$window: {console:{log:log}}}); + var scope = createScope(null, angularService, {$window: {console:{log:log}}, $document:[{}]}); scope.$log.log(); scope.$log.warn(); scope.$log.info(); @@ -58,7 +58,7 @@ describe("service", function(){ }); it('should use noop if no console', function(){ - var scope = createScope(null, angularService, {$window: {}}); + var scope = createScope(null, angularService, {$window: {}, $document:[{}]}); scope.$log.log(); scope.$log.warn(); scope.$log.info(); |