v1.14.0

tombatossals · Jun 13, 2016 · 77d4294 · 77d4294
2 parents bf4c67e + 915ab2c
commit 77d4294
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 13 deletions.
diff --git a/dist/angular-openlayers-directive.js b/dist/angular-openlayers-directive.js
@@ -87,7 +87,9 @@ angular.module('openlayers-directive', ['ngSanitize']).directive('openlayers', [
                     controls: controls,
                     interactions: interactions,
                     renderer: defaults.renderer,
-                    view: view
+                    view: view,
+                    loadTilesWhileAnimating: defaults.loadTilesWhileAnimating,
+                    loadTilesWhileInteracting: defaults.loadTilesWhileInteracting
                 });
 
                 scope.$on('$destroy', function() {
@@ -2359,6 +2361,13 @@ angular.module('openlayers-directive').factory('olMapDefaults', ["$q", "olHelper
                     newDefaults.styles = angular.extend(newDefaults.styles, userDefaults.styles);
                 }
 
+                if (isDefined(userDefaults.loadTilesWhileAnimating)) {
+                    newDefaults.loadTilesWhileAnimating = userDefaults.loadTilesWhileAnimating;
+                }
+
+                if (isDefined(userDefaults.loadTilesWhileInteracting)) {
+                    newDefaults.loadTilesWhileInteracting = userDefaults.loadTilesWhileInteracting;
+                }
             }
 
             defaults[scopeId] = newDefaults;

diff --git a/dist/angular-openlayers-directive.min.js b/dist/angular-openlayers-directive.min.js
diff --git a/dist/angular-openlayers-directive.min.no-header.js b/dist/angular-openlayers-directive.min.no-header.js
diff --git a/dist/angular-openlayers-directive.pre.js b/dist/angular-openlayers-directive.pre.js
@@ -87,7 +87,9 @@ angular.module('openlayers-directive', ['ngSanitize']).directive('openlayers', f
                     controls: controls,
                     interactions: interactions,
                     renderer: defaults.renderer,
-                    view: view
+                    view: view,
+                    loadTilesWhileAnimating: defaults.loadTilesWhileAnimating,
+                    loadTilesWhileInteracting: defaults.loadTilesWhileInteracting
                 });
 
                 scope.$on('$destroy', function() {
@@ -2359,6 +2361,13 @@ angular.module('openlayers-directive').factory('olMapDefaults', function($q, olH
                     newDefaults.styles = angular.extend(newDefaults.styles, userDefaults.styles);
                 }
 
+                if (isDefined(userDefaults.loadTilesWhileAnimating)) {
+                    newDefaults.loadTilesWhileAnimating = userDefaults.loadTilesWhileAnimating;
+                }
+
+                if (isDefined(userDefaults.loadTilesWhileInteracting)) {
+                    newDefaults.loadTilesWhileInteracting = userDefaults.loadTilesWhileInteracting;
+                }
             }
 
             defaults[scopeId] = newDefaults;

diff --git a/examples/030-custom-parameters-example.html b/examples/030-custom-parameters-example.html
@@ -31,7 +31,9 @@
                         zoom: false,
                         rotate: false,
                         attribution: false
-                    }
+                    },
+                    loadTilesWhileAnimating: true,
+                    loadTilesWhileInteracting: true
                 }
             });
         } ]);

diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "load-grunt-config": "^0.17.1",
     "matchdep": "~0.3.0",
     "phantomjs": "^1.9.18",
-    "protractor": "^2.0.0",
+    "protractor": "~2.5.0",
     "publish-latest": "^1.1.2",
     "semantic-release": "^4.3.5"
   },
@@ -65,5 +65,5 @@
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "main": "dist/angular-openlayers-directive",
-  "version": "1.13.1"
+  "version": "1.14.0"
 }
diff --git a/src/directives/openlayers.js b/src/directives/openlayers.js
@@ -72,7 +72,9 @@ angular.module('openlayers-directive', ['ngSanitize']).directive('openlayers', f
                     controls: controls,
                     interactions: interactions,
                     renderer: defaults.renderer,
-                    view: view
+                    view: view,
+                    loadTilesWhileAnimating: defaults.loadTilesWhileAnimating,
+                    loadTilesWhileInteracting: defaults.loadTilesWhileInteracting
                 });
 
                 scope.$on('$destroy', function() {

diff --git a/src/services/olMapDefaults.js b/src/services/olMapDefaults.js
@@ -136,6 +136,13 @@ angular.module('openlayers-directive').factory('olMapDefaults', function($q, olH
                     newDefaults.styles = angular.extend(newDefaults.styles, userDefaults.styles);
                 }
 
+                if (isDefined(userDefaults.loadTilesWhileAnimating)) {
+                    newDefaults.loadTilesWhileAnimating = userDefaults.loadTilesWhileAnimating;
+                }
+
+                if (isDefined(userDefaults.loadTilesWhileInteracting)) {
+                    newDefaults.loadTilesWhileInteracting = userDefaults.loadTilesWhileInteracting;
+                }
             }
 
             defaults[scopeId] = newDefaults;

diff --git a/test/protractor.conf.js b/test/protractor.conf.js
@@ -15,7 +15,7 @@ exports.config = {
     // chromeDriver)
 
     // The location of the selenium standalone server .jar file.
-    seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.45.0.jar',
+    seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.47.1.jar',
     // The port to start the selenium server on, or null if the server should
     // find its own unused port.
     seleniumPort: null,