Merge pull request #4684 from camptocamp/cleanup

Use window.location.href instead of window.location
camptocamp · Feb 26, 2019 · 506fb16 · 506fb16
2 parents 8fc2e11 + 457e1bf
commit 506fb16
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ To know more about ngeo take a look at:
 ngeo also includes a [contribs](contribs) directory where non-core
 contributions may be placed. ngeo currently includes one contrib: `gmf`.  That
 contrib includes components specific to the
-[GeoMapFish](http://geomapfish.org/) project, that is components that rely on
+[GeoMapFish](https://geomapfish.org/) project, that is components that rely on
 GeoMapFish-specific web services. The `gmf` contrib examples are also available
 [online](https://camptocamp.github.io/ngeo/master/examples/contribs/gmf/).
 

diff --git a/contribs/gmf/apps/desktop/Controller.js b/contribs/gmf/apps/desktop/Controller.js
@@ -21,7 +21,7 @@ if (!window.requestAnimationFrame) {
     + 'Vous allez être redirigé.\n\n'
     + 'Ihr Browser wird nicht unterstützt, bitte aktualisieren Sie ihn oder verwenden Sie einen anderen. '
     + 'Sie werden weitergeleitet.');
-  window.location = 'http://geomapfish.org/';
+  window.location.href = 'https://geomapfish.org/';
 }
 
 

diff --git a/contribs/gmf/apps/desktop_alt/Controller.js b/contribs/gmf/apps/desktop_alt/Controller.js
@@ -25,7 +25,7 @@ if (!window.requestAnimationFrame) {
     + 'Vous allez être redirigé.\n\n'
     + 'Ihr Browser wird nicht unterstützt, bitte aktualisieren Sie ihn oder verwenden Sie einen anderen. '
     + 'Sie werden weitergeleitet.');
-  window.location = 'http://geomapfish.org/';
+  window.location.href = 'https://geomapfish.org/';
 }
 
 

diff --git a/contribs/gmf/apps/iframe_api/Controller.js b/contribs/gmf/apps/iframe_api/Controller.js
@@ -21,7 +21,7 @@ if (!window.requestAnimationFrame) {
     + 'Vous allez être redirigé.\n\n'
     + 'Ihr Browser wird nicht unterstützt, bitte aktualisieren Sie ihn oder verwenden Sie einen anderen. '
     + 'Sie werden weitergeleitet.');
-  window.location = 'http://geomapfish.org/';
+  window.location.href = 'https://geomapfish.org/';
 }
 
 

diff --git a/contribs/gmf/apps/mobile/Controller.js b/contribs/gmf/apps/mobile/Controller.js
@@ -21,7 +21,7 @@ if (!window.requestAnimationFrame) {
     + 'Vous allez être redirigé.\n\n'
     + 'Ihr Browser wird nicht unterstützt, bitte aktualisieren Sie ihn oder verwenden Sie einen anderen. '
     + 'Sie werden weitergeleitet.');
-  window.location = 'http://geomapfish.org/';
+  window.location.href = 'https://geomapfish.org/';
 }
 
 

diff --git a/contribs/gmf/apps/mobile_alt/Controller.js b/contribs/gmf/apps/mobile_alt/Controller.js
@@ -25,7 +25,7 @@ if (!window.requestAnimationFrame) {
     + 'Vous allez être redirigé.\n\n'
     + 'Ihr Browser wird nicht unterstützt, bitte aktualisieren Sie ihn oder verwenden Sie einen anderen. '
     + 'Sie werden weitergeleitet.');
-  window.location = 'http://geomapfish.org/';
+  window.location.href = 'https://geomapfish.org/';
 }
 
 

diff --git a/contribs/gmf/apps/oeedit/Controller.js b/contribs/gmf/apps/oeedit/Controller.js
@@ -26,7 +26,7 @@ if (!window.requestAnimationFrame) {
     + 'Vous allez être redirigé.\n\n'
     + 'Ihr Browser wird nicht unterstützt, bitte aktualisieren Sie ihn oder verwenden Sie einen anderen. '
     + 'Sie werden weitergeleitet.');
-  window.location = 'http://geomapfish.org/';
+  window.location.href = 'https://geomapfish.org/';
 }
 
 

diff --git a/contribs/gmf/apps/oeview/Controller.js b/contribs/gmf/apps/oeview/Controller.js
@@ -21,7 +21,7 @@ if (!window.requestAnimationFrame) {
     + 'Vous allez être redirigé.\n\n'
     + 'Ihr Browser wird nicht unterstützt, bitte aktualisieren Sie ihn oder verwenden Sie einen anderen. '
     + 'Sie werden weitergeleitet.');
-  window.location = 'http://geomapfish.org/';
+  window.location.href = 'https://geomapfish.org/';
 }
 
 

diff --git a/contribs/gmf/src/controllers/bootstrap.js b/contribs/gmf/src/controllers/bootstrap.js
@@ -29,7 +29,7 @@ function bootstrap(module) {
     if (dynamic['doRedirect']) {
       const small_screen = window.matchMedia ? window.matchMedia('(max-width: 1024px)') : false;
       if (small_screen && TOUCH) {
-        window.location = dynamic['redirectUrl'];
+        window.location.href = dynamic['redirectUrl'];
       }
     }
 

diff --git a/contribs/gmf/src/themes.js b/contribs/gmf/src/themes.js
@@ -175,8 +175,6 @@
 
 /**
  * @typedef {Object} GmfMetaData
- * @property {Array.<string>} [copy_to] Names of layers on which the geometry can be copied to (in the
- *      edition mode). For WMS layers and only for CGXP ! (Use "copyable" in NGEO.).
  * @property {boolean} [copyable=false] Whether the geometry from this data source can be copied to other data
  *      sources or not. For WMS layers.
  * @property {Array.<string>} [directedFilterAttributes] List of attribute names which should have rules

diff --git a/examples/popupservice.js b/examples/popupservice.js
@@ -64,7 +64,7 @@ MainController.prototype.iframePopup = function() {
   popup.setAutoDestroy(true);
   popup.addClass('popup-with-iframe');
   popup.setTitle('Iframe popup');
-  popup.setUrl('http://geomapfish.org/');
+  popup.setUrl('https://geomapfish.org/');
   popup.setSize('400px', '300px');
   popup.setOpen(true);
 };
@@ -124,7 +124,7 @@ MainController.prototype.openPopupWithUrl = function() {
     cls: 'popup-with-iframe',
     height: '300px',
     title: 'Opened with "open" and "iframe"',
-    url: 'http://geomapfish.org/',
+    url: 'https://geomapfish.org/',
     width: '400px'
   });
 };