camptocamp · sbrunner · May 29, 2019 · Nov 1, 2018 · Nov 1, 2018 · Nov 27, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -65,10 +65,7 @@ script:
 # Generate API doc
 - npm install --prefix openlayers_src https://api.github.com/repos/openlayers/openlayers/tarball/v5.3.1
 - '! (npm run typecheck|sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g"|grep ^src)'
-- '! (npm run typecheck|grep api)'
-- '! (npm run typecheck|grep gmf)'
-- '! (npm run typecheck|grep test/)'
-- '! (npm run typecheck|grep examples)'
+- '! (npm run typecheck|grep -E "api|gmf|test/|examples")'
 - npm run doc
 - npm run build-api
 

diff --git a/api/src/Map.js b/api/src/Map.js
@@ -377,7 +377,7 @@ class Map {
 /**
  * @param {string[]} keys Keys.
  * @param {Array<*>} values Values.
- * @returns {Object<string, *>} Object.
+ * @return {Object<string, *>} Object.
  * @private
  * @hidden
  */
@@ -394,7 +394,7 @@ function zip(keys, values) {
 /**
  * @param {Object<string, *>} obj Object.
  * @param {string[]} keys keys.
- * @returns {Object<string, *>} Object.
+ * @return {Object<string, *>} Object.
  * @private
  * @hidden
  */

diff --git a/api/src/Themes.js b/api/src/Themes.js
@@ -15,7 +15,7 @@ let themesPromise;
 
 /**
  * @hidden
- * @returns {Promise<import('gmf/themes.js').GmfThemesResponse>} Promise
+ * @return {Promise<import('gmf/themes.js').GmfThemesResponse>} Promise
  */
 function getThemesPromise() {
   if (!themesPromise) {
@@ -35,7 +35,7 @@ let overlayDefPromise;
 
 /**
  * @hidden
- * @returns {Promise<Array<TileLayer|ImageLayer|GroupLayer>>} Promise
+ * @return {Promise<Array<TileLayer|ImageLayer|GroupLayer>>} Promise
  */
 export function getBackgroundLayers() {
   return getThemesPromise().then((themes) => {
@@ -107,7 +107,7 @@ const overlayDefs = new Map();
 
 /**
  * @hidden
- * @returns {Promise<Map<string, overlayDefinition>>} Promise
+ * @return {Promise<Map<string, overlayDefinition>>} Promise
  */
 export function getOverlayDefs() {
   if (!overlayDefPromise) {
@@ -128,7 +128,7 @@ export function getOverlayDefs() {
  * @param {Object} config Config
  * @param {import('gmf/themes.js').GmfOgcServers} ogcServers OGC servers
  * @param {import('gmf/themes.js').GmfOgcServer} [opt_ogcServer] OGC server
- * @returns {void}
+ * @return {void}
  * @hidden
  */
 export function writeOverlayDefs(config, ogcServers, opt_ogcServer) {

diff --git a/buildtools/travis-npm-publish.sh b/buildtools/travis-npm-publish.sh
@@ -18,7 +18,7 @@ then
         fi
         if [ "$PACKAGE_VERSION" = "$TRAVIS_TAG" ]
         then
-            $RUN npm publish $TAG
+            $RUN npm publish --tag=version-${MAIN_BRANCH} $TAG
         else
             echo "Skipping publication, the travis tag and package version differ"
         fi
@@ -27,7 +27,7 @@ then
         then
             echo "Publish daily version"
             $RUN npm install --no-save fluid-publish
-            $RUN node_modules/.bin/fluid-publish devTag="latest"
+            $RUN node_modules/.bin/fluid-publish devTag="version-${MAIN_BRANCH}-latest"
         fi
     fi
 fi
diff --git a/contribs/gmf/apps/desktop/index.html.ejs b/contribs/gmf/apps/desktop/index.html.ejs
@@ -289,7 +289,7 @@
       <ngeo-modal
           ngeo-modal-closable="false"
           ng-model="mainCtrl.userMustChangeItsPassword">
-        <div class="modal-header">
+        <div class="modal-header ui-draggable-handle">
           <h4 class="modal-title">
             {{'You must change your password' | translate}}
           </h4>

diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs
@@ -333,7 +333,7 @@
         <gmf-share ng-if="mainCtrl.modalShareShown" gmf-share-email="false"></gmf-share>
       </ngeo-modal>
       <ngeo-modal ng-model="disclaimerVisibility">
-        <div class="modal-header">
+        <div class="modal-header ui-draggable-handle">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         </div>
         <div class="modal-body">

diff --git a/contribs/gmf/apps/iframe_api/index.html.ejs b/contribs/gmf/apps/iframe_api/index.html.ejs
@@ -12,9 +12,9 @@
     <% } %>
   </head>
   <body>
-  <div ng-show="mainCtrl.loading" class="loading-mask">
-    <i class="fa fa-spinner fa-spin spinner-loading-mask"></i>
-  </div>
+    <div ng-show="mainCtrl.loading" class="loading-mask">
+      <i class="fa fa-spinner fa-spin spinner-loading-mask"></i>
+    </div>
     <main>
       <div class="gmf-app-map-container" ng-class="{'gmf-app-infobar-active': mainCtrl.showInfobar}">
         <ngeo-displaywindow
@@ -76,7 +76,7 @@
       <ngeo-modal
           ngeo-modal-closable="false"
           ng-model="mainCtrl.userMustChangeItsPassword">
-        <div class="modal-header">
+        <div class="modal-header ui-draggable-handle">
           <h4 class="modal-title">
             {{'You must change your password' | translate}}
           </h4>

diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs
@@ -17,11 +17,9 @@
   <body ng-class="{'gmf-mobile-nav-is-visible': mainCtrl.navIsVisible(),
                    'gmf-mobile-nav-left-is-visible': mainCtrl.leftNavVisible,
                    'gmf-mobile-nav-right-is-visible': mainCtrl.rightNavVisible}">
-  <div ng-show="mainCtrl.loading" class="loading-mask">
-    <i class="fa fa-spinner fa-spin spinner-loading-mask"></i>
-    &nbsp;
-    <img src="<%=require("./image/logo.png")%>" />
-  </div>
+    <div ng-show="mainCtrl.loading" class="loading-mask">
+      <i class="fa fa-spinner fa-spin spinner-loading-mask"></i>
+    </div>
     <main ng-class="{'gmf-search-is-active': mainCtrl.searchOverlayVisible}">
       <gmf-map
         gmf-map-map="mainCtrl.map"
@@ -190,7 +188,7 @@
     </nav>
     <ngeo-modal
         ng-model="mainCtrl.userMustChangeItsPassword">
-      <div class="modal-header">
+      <div class="modal-header ui-draggable-handle">
         <h4 class="modal-title">
           {{'You must change your password' | translate}}
         </h4>

diff --git a/contribs/gmf/apps/mobile_alt/index.html.ejs b/contribs/gmf/apps/mobile_alt/index.html.ejs
@@ -16,11 +16,9 @@
   <body ng-class="{'gmf-mobile-nav-is-visible': mainCtrl.navIsVisible(),
                    'gmf-mobile-nav-left-is-visible': mainCtrl.leftNavVisible,
                    'gmf-mobile-nav-right-is-visible': mainCtrl.rightNavVisible}">
-  <div ng-show="mainCtrl.loading" class="loading-mask">
-    <i class="fa fa-spinner fa-spin spinner-loading-mask"></i>
-    &nbsp;
-    <img src="<%=require("./image/logo.png")%>" />
-  </div>
+    <div ng-show="mainCtrl.loading" class="loading-mask">
+      <i class="fa fa-spinner fa-spin spinner-loading-mask"></i>
+    </div>
     <main ng-class="{'gmf-search-is-active': mainCtrl.searchOverlayVisible}">
       <gmf-map
         gmf-map-map="mainCtrl.map"

diff --git a/contribs/gmf/examples/common_dependencies.js b/contribs/gmf/examples/common_dependencies.js
@@ -1,4 +1,4 @@
-import 'gmf/sass/vars.scss'
+import 'gmf/sass/vars.scss';
 import 'jquery';
 import 'angular';
 import 'angular-gettext';

diff --git a/contribs/gmf/src/authentication/component.html b/contribs/gmf/src/authentication/component.html
@@ -127,7 +127,7 @@
 
   <ngeo-modal
       ng-model="$ctrl.resetPasswordModalShown">
-    <div class="modal-header">
+    <div class="modal-header ui-draggable-handle">
       <button type="button"
               class="close"
               data-dismiss="modal"

diff --git a/contribs/gmf/src/authentication/component.js b/contribs/gmf/src/authentication/component.js
@@ -106,7 +106,7 @@ function gmfAuthenticationTemplateUrl($element, $attrs, gmfAuthenticationTemplat
  *     <ngeo-modal
  *         ngeo-modal-closable="false"
  *         ng-model="mainCtrl.userMustChangeItsPassword">
- *       <div class="modal-header">
+ *       <div class="modal-header ui-draggable-handle">
  *         <h4 class="modal-title">
  *           {{'You must change your password' | translate}}
  *         </h4>

diff --git a/contribs/gmf/src/backgroundlayerselector/component.js b/contribs/gmf/src/backgroundlayerselector/component.js
@@ -66,11 +66,11 @@ function gmfBackgroundlayerselectorTemplateUrl($element, $attrs, gmfBackgroundla
  *
  * Used metadata:
  *
- *  * thumbnail: The URL used for the icon.
+ *  * `thumbnail`: The URL used for the icon.
  *
- * Used functionnalities:
+ * Used functionalities:
  *
- *  * default_basemap: Base maps to use by default.
+ *  * `default_basemap`: Base maps to use by default.
  *
  * @htmlAttribute {import("ol/Map.js").default=} gmf-backgroundlayerselector-map The map.
  * @htmlAttribute {string} gmf-backgroundlayer-opacity-options The opacity slider options.
@@ -207,7 +207,7 @@ Controller.prototype.handleThemesChange_ = function() {
 /**
  * Getter/setter for background layer overlay, used by opacity slider.
  * @param {?number} val The opacity.
- * @returns {number} The background layer opacity.
+ * @return {number} The background layer opacity.
  */
 Controller.prototype.getSetBgLayerOpacity = function(val) {
   if (!this.opacityLayer) {

diff --git a/contribs/gmf/src/controllers/AbstractAppController.js b/contribs/gmf/src/controllers/AbstractAppController.js
@@ -53,12 +53,9 @@ import {ThemeEventType} from 'gmf/theme/Manager.js';
 /**
  * Application abstract controller.
  *
- * This file includes `goog.require` for base components/directives used
- * by the HTML page and the controller to provide the configuration.
+ * Used functionalities:
  *
- * Used functionnalities:
- *
- *  * open_panel: When set, contains the name of the panel to open upon loading an application.
+ *  * `open_panel`: When set, contains the name of the panel to open upon loading an application.
  *      Note: although this is a list, only one can be defined.
  *
  *

diff --git a/contribs/gmf/src/controllers/AbstractDesktopController.js b/contribs/gmf/src/controllers/AbstractDesktopController.js
@@ -228,6 +228,7 @@ export class AbstractDesktopController extends AbstractAPIController {
    * If, after resizing, the size of the data panel would be too big,
    * resize it as well.
    * @private
+   * @hidden
    */
   setDataPanelMaxResizableWidth_() {