- Finalize: Update docker compose files and refresh of JS assets

GeoNode · Nov 28, 2018 · 0f84734 · 0f84734
1 parent 0160cf5
commit 0f84734
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 87 deletions.
diff --git a/geonode/static/geonode/js/status/main.js b/geonode/static/geonode/js/status/main.js
@@ -1,24 +1,26 @@
 /*global define: true, requirejs:true */
 
+'use strict';
+
 requirejs.config({
   config: {
-     baseUrl: siteUrl + 'static/lib/js',
      text: {
        useXhr: function (url, protocol, hostname, port) {
           // allow cross-domain requests
           // remote server allows CORS
           return true;
        }
      },
-     shim: {
-        'underscore': { exports: '_'}
-     },
-     paths: {
-         'upload': '../../geonode/js/upload',
-         'templates': '../../geonode/js/templates',
-         'progress': 'jquery.ajax-progress'
-     },
      waitSeconds: 5
+  },
+  baseUrl: siteUrl + 'static/lib/js',
+  shim: {
+    'underscore': { exports: '_'}
+  },
+  paths: {
+    'upload': '../../geonode/js/upload',
+    'templates': '../../geonode/js/templates',
+    'progress': 'jquery.ajax-progress'
   }
 });
 

diff --git a/geonode/static/geonode/js/upload/FileType.js b/geonode/static/geonode/js/upload/FileType.js
@@ -2,7 +2,7 @@
 'use strict';
 
 define(function (require, exports) {
-    var getExt = require('upload/path').getExt,
+    var getExt = require('./path').getExt,
         FileType;
 
     /** Create an instance of a FileType object

diff --git a/geonode/static/geonode/js/upload/LayerInfo.js b/geonode/static/geonode/js/upload/LayerInfo.js
@@ -4,9 +4,9 @@
 
 define(function (require, exports) {
         var _      = require('underscore'),
-        fileTypes  = require('upload/FileTypes'),
-        path       = require('upload/path'),
-        common     = require('upload/common'),
+        fileTypes  = require('./FileTypes'),
+        path       = require('./path'),
+        common     = require('./common'),
         LayerInfo;
 
     /** Creates an instance of a LayerInfo

diff --git a/geonode/static/geonode/js/upload/csv.js b/geonode/static/geonode/js/upload/csv.js
@@ -1,24 +1,26 @@
 /*globals define: true, requirejs: true */
 
+'use strict';
+
 requirejs.config({
   config: {
-     baseUrl: siteUrl + 'static/lib/js',
      text: {
        useXhr: function (url, protocol, hostname, port) {
           // allow cross-domain requests
           // remote server allows CORS
           return true;
        }
      },
-     shim: {
-        'underscore': { exports: '_'}
-     },
-     paths: {
-         'upload': '../../geonode/js/upload',
-         'templates': '../../geonode/js/templates',
-         'progress': 'jquery.ajax-progress'
-     },
      waitSeconds: 5
+  },
+  baseUrl: siteUrl + 'static/lib/js',
+  shim: {
+    'underscore': { exports: '_'}
+  },
+  paths: {
+    'upload': '../../geonode/js/upload',
+    'templates': '../../geonode/js/templates',
+    'progress': 'jquery.ajax-progress'
   }
 });
 

diff --git a/geonode/static/geonode/js/upload/main.js b/geonode/static/geonode/js/upload/main.js
@@ -1,29 +1,30 @@
 /*globals define: true, requirejs: true */
 
+'use strict';
+
 requirejs.config({
   config: {
-     baseUrl: siteUrl + 'static/lib/js',
      text: {
        useXhr: function (url, protocol, hostname, port) {
           // allow cross-domain requests
           // remote server allows CORS
           return true;
        }
      },
-     shim: {
-        'underscore': { exports: '_'}
-     },
-     paths: {
-         'upload': '../../geonode/js/upload',
-         'templates': '../../geonode/js/templates',
-         'progress': 'jquery.ajax-progress'
-     },
      waitSeconds: 5
+  },
+  baseUrl: siteUrl + 'static/lib/js',
+  shim: {
+    'underscore': { exports: '_'}
+  },
+  paths: {
+    'upload': '../../geonode/js/upload',
+    'templates': '../../geonode/js/templates',
+    'progress': 'jquery.ajax-progress'
   }
 });
 
 define(['upload/upload'], function (upload) {
-    'use strict';
 
     $(function () {
         upload.initialize({

diff --git a/geonode/static/geonode/js/upload/srs.js b/geonode/static/geonode/js/upload/srs.js
@@ -1,28 +1,32 @@
 /*globals define: true, requirejs: true */
 
+'use strict';
+
 requirejs.config({
   config: {
-     baseUrl: siteUrl + 'static/lib/js',
      text: {
        useXhr: function (url, protocol, hostname, port) {
           // allow cross-domain requests
           // remote server allows CORS
           return true;
        }
      },
-     shim: {
-        'underscore': { exports: '_'}
-     },
-     paths: {
-         'upload': '../../geonode/js/upload',
-         'templates': '../../geonode/js/templates',
-         'progress': 'jquery.ajax-progress'
-     },
      waitSeconds: 5
+  },
+  baseUrl: siteUrl + 'static/lib/js',
+  shim: {
+    'underscore': { exports: '_'}
+  },
+  paths: {
+    'upload': '../../geonode/js/upload',
+    'templates': '../../geonode/js/templates',
+    'progress': 'jquery.ajax-progress'
   }
 });
 
-define(['upload/upload','upload/common', 'upload/LayerInfo'], function (upload, common, LayerInfo) {
+define(['upload/upload',
+        'upload/common',
+        'upload/LayerInfo'], function (upload, common, LayerInfo) {
     'use strict';
 
     var doSrs = function (event) {

diff --git a/geonode/static/geonode/js/upload/time.js b/geonode/static/geonode/js/upload/time.js
@@ -1,28 +1,31 @@
 /*globals define: true, requirejs: true */
+'use strict';
 
 requirejs.config({
   config: {
-     baseUrl: siteUrl + 'static/lib/js',
      text: {
        useXhr: function (url, protocol, hostname, port) {
           // allow cross-domain requests
           // remote server allows CORS
           return true;
        }
      },
-     shim: {
-        'underscore': { exports: '_'}
-     },
-     paths: {
-         'upload': '../../geonode/js/upload',
-         'templates': '../../geonode/js/templates',
-         'progress': 'jquery.ajax-progress'
-     },
      waitSeconds: 5
+  },
+  baseUrl: siteUrl + 'static/lib/js',
+  shim: {
+    'underscore': { exports: '_'}
+  },
+  paths: {
+    'upload': '../../geonode/js/upload',
+    'templates': '../../geonode/js/templates',
+    'progress': 'jquery.ajax-progress'
   }
 });
 
-define(['upload/upload','upload/common', 'upload/LayerInfo'], function (upload, common, LayerInfo) {
+define(['upload/upload',
+        'upload/common',
+        'upload/LayerInfo'], function (upload, common, LayerInfo) {
     'use strict';
 
     function isTimeSeries() {

diff --git a/geonode/static/geonode/js/upload/upload.js b/geonode/static/geonode/js/upload/upload.js
@@ -7,33 +7,11 @@ var layers = {};
 
 var geogig_stores = {};
 
-requirejs.config({
-  config: {
-     baseUrl: siteUrl + 'static/lib/js',
-     text: {
-       useXhr: function (url, protocol, hostname, port) {
-          // allow cross-domain requests
-          // remote server allows CORS
-          return true;
-       }
-     },
-     shim: {
-        'underscore': { exports: '_'}
-     },
-     paths: {
-         'upload': '../../geonode/js/upload',
-         'templates': '../../geonode/js/templates',
-         'progress': 'jquery.ajax-progress'
-     },
-     waitSeconds: 5
-  }
-});
-
 define(['underscore',
-        'upload/LayerInfo',
-        'upload/FileTypes',
-        'upload/path',
-        'upload/common',
+        './LayerInfo',
+        './FileTypes',
+        './path',
+        './common',
         'text!templates/upload.html'], function (_, LayerInfo, fileTypes, path, common, uploadTemplate) {
 
     var templates = {},

diff --git a/geonode/static/geonode/js/utils/batch_ops.js b/geonode/static/geonode/js/utils/batch_ops.js
@@ -1,24 +1,26 @@
 /*globals define: true, requirejs: true */
 
+'use strict';
+
 requirejs.config({
   config: {
-     baseUrl: siteUrl + 'static/lib/js',
      text: {
        useXhr: function (url, protocol, hostname, port) {
           // allow cross-domain requests
           // remote server allows CORS
           return true;
        }
      },
-     shim: {
-        'underscore': { exports: '_'}
-     },
-     paths: {
-         'upload': '../../geonode/js/upload',
-         'templates': '../../geonode/js/templates',
-         'progress': 'jquery.ajax-progress'
-     },
      waitSeconds: 5
+  },
+  baseUrl: siteUrl + 'static/lib/js',
+  shim: {
+    'underscore': { exports: '_'}
+  },
+  paths: {
+    'upload': '../../geonode/js/upload',
+    'templates': '../../geonode/js/templates',
+    'progress': 'jquery.ajax-progress'
   }
 });