e2e against "cloud", minor change for IE

airfranceklm · Aug 24, 2014 · aafd92b · aafd92b
1 parent 8a2d191
commit aafd92b
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 17 deletions.
diff --git a/config/grunt/aliases.yml b/config/grunt/aliases.yml
@@ -17,7 +17,6 @@ test:
   - 'karma:unit'
 
 e2eSauce:
- - 'connect:test'
  - 'protractor:sauce'
 
 e2eChrome:

diff --git a/config/protractor-chrome.js b/config/protractor-chrome.js
@@ -18,6 +18,7 @@ exports.config = {
     chromeOnly: true,
 
     baseUrl: 'http://localhost:8000/',
+    // baseUrl: 'http://afklm.github.io/ng-lazy-image/',
 
     framework: 'jasmine',
 

diff --git a/config/protractor-sauce.js b/config/protractor-sauce.js
@@ -12,7 +12,7 @@ exports.config = {
         'name': 'AFKL-LAZY-IMAGE CHROME OSX ' + process.env.TRAVIS_BUILD_NUMBER
     }/*, {
         'browserName': 'internet explorer',
-        'platform': 'Windows 8',
+        'platform': 'ANY',
         'version': '10',
         'ignoreProtectedModeSettings': true,
         'tunnel-identifier': process.env.TRAVIS_JOB_NUMBER,
@@ -27,7 +27,7 @@ exports.config = {
         '../test/e2e/*.js'
     ],
 
-    baseUrl: 'http://localhost:8000/',
+    baseUrl: 'http://afklm.github.io/ng-lazy-image/',
 
     framework: 'jasmine',
 

diff --git a/dist/lazy-image.js b/dist/lazy-image.js
@@ -1,6 +1,6 @@
 /* global angular */
 angular.module('afkl.lazyImage', [])
-    .service('afklSrcSetService', ['$window', function($window) {
+    .service('afklSrcSetService', ['$window', '$document', function($window, $document) {
         'use strict';
 
         /**
@@ -106,9 +106,9 @@ angular.module('afkl.lazyImage', [])
             if (!imageCandidates) { return; }
             if (!view) {
                 view = {
-                    'w' : $window.innerWidth,
-                    'h' : $window.innerHeight,
-                    'x' : $window.devicePixelRatio
+                    'w' : $window.innerWidth || $document[0].documentElement.clientWidth,
+                    'h' : $window.innerHeight || $document[0].documentElement.clientHeight,
+                    'x' : $window.devicePixelRatio || 1
                 };
             }
 
@@ -294,7 +294,7 @@ angular.module('afkl.lazyImage', [])
 
 
     }])
-    .directive('afklLazyImage', ['$window', '$timeout', 'afklSrcSetService', function ($window, $timeout, srcSetService) {
+    .directive('afklLazyImage', ['$window', '$document', '$timeout', 'afklSrcSetService', function ($window, $document, $timeout, srcSetService) {
         'use strict';
 
         // Use srcSetService to find out our best available image
@@ -370,7 +370,15 @@ angular.module('afkl.lazyImage', [])
                     // Config vars
                     var remaining, shouldLoad, windowBottom;
 
-                    windowBottom = $window[0].innerHeight + $window[0].scrollY;
+                    var height = "innerHeight" in $window[0] ? 
+                        $window[0].innerHeight 
+                        : $document[0].documentElement.clientHeight;
+
+                    var scroll = "scrollY" in $window[0] ? 
+                        $window[0].scrollY 
+                        : document[0].documentElement.scrollTop;
+
+                    windowBottom = height + scroll;
                     remaining = offsetElement - windowBottom;
 
                     // Is our top of our image container in bottom of our viewport?

diff --git a/dist/lazy-image.min.js b/dist/lazy-image.min.js
diff --git a/src/lazy-image.js b/src/lazy-image.js
@@ -1,6 +1,6 @@
 /* global angular */
 angular.module('afkl.lazyImage', [])
-    .service('afklSrcSetService', ['$window', function($window) {
+    .service('afklSrcSetService', ['$window', '$document', function($window, $document) {
         'use strict';
 
         /**
@@ -106,9 +106,9 @@ angular.module('afkl.lazyImage', [])
             if (!imageCandidates) { return; }
             if (!view) {
                 view = {
-                    'w' : $window.innerWidth,
-                    'h' : $window.innerHeight,
-                    'x' : $window.devicePixelRatio
+                    'w' : $window.innerWidth || $document[0].documentElement.clientWidth,
+                    'h' : $window.innerHeight || $document[0].documentElement.clientHeight,
+                    'x' : $window.devicePixelRatio || 1
                 };
             }
 
@@ -294,7 +294,7 @@ angular.module('afkl.lazyImage', [])
 
 
     }])
-    .directive('afklLazyImage', ['$window', '$timeout', 'afklSrcSetService', function ($window, $timeout, srcSetService) {
+    .directive('afklLazyImage', ['$window', '$document', '$timeout', 'afklSrcSetService', function ($window, $document, $timeout, srcSetService) {
         'use strict';
 
         // Use srcSetService to find out our best available image
@@ -370,7 +370,15 @@ angular.module('afkl.lazyImage', [])
                     // Config vars
                     var remaining, shouldLoad, windowBottom;
 
-                    windowBottom = $window[0].innerHeight + $window[0].scrollY;
+                    var height = "innerHeight" in $window[0] ? 
+                        $window[0].innerHeight 
+                        : $document[0].documentElement.clientHeight;
+
+                    var scroll = "scrollY" in $window[0] ? 
+                        $window[0].scrollY 
+                        : document[0].documentElement.scrollTop;
+
+                    windowBottom = height + scroll;
                     remaining = offsetElement - windowBottom;
 
                     // Is our top of our image container in bottom of our viewport?

diff --git a/test/e2e/scenarios.js b/test/e2e/scenarios.js
@@ -7,7 +7,7 @@
 
 describe('Viewports:', function () {
 
-    browser.get('/');
+    browser.get('index.html');
 
     it('Do we get desktop image, and does url update on resize', function () {
         browser.manage().window().setSize(1024, 768);