Fix gitsha querying in all examples

hslayers · Jan 29, 2019 · f321c3e · f321c3e
1 parent dac420d
commit f321c3e
Show file tree

Hide file tree

Showing 21 changed files with 152 additions and 46 deletions.
diff --git a/components/core/core.js b/components/core/core.js
@@ -3,7 +3,7 @@
  * @ngdoc module
  * @module hs.core
  * @name hs.core
- * @description Core module for whole HSLayers-NG. Contain paths to all other HS modules and dependencies (therefore it is not needed to specify them in hslayers.js file). Core module consists of Core service which keeps some app-level settings and mantain app size and panel statuses.
+ * @description Core module for whole HSLayers-NG. Contains paths to all other HS modules and dependencies (therefore it is not needed to specify them in hslayers.js file). Core module consists of Core service which keeps some app-level settings and mantain app size and panel statuses.
  */
 
 if (typeof window.hslMin != 'undefined') {
@@ -25,6 +25,7 @@ if (require.config) require.config({
         'ngAria': nm_path + 'angular-aria/angular-aria' + hslMin,
         'ngMessages': nm_path + 'angular-messages/angular-messages' + hslMin,
         'angular-material': nm_path + 'angular-material/angular-material' + hslMin,
+        'jquery': nm_path + 'jquery/dist/jquery' + hslMin,
         ol: requirejs.s.contexts._.config.paths.ol || ((hslMin == '.min') ? nm_path + 'openlayers/dist/ol' : nm_path + 'openlayers/dist/ol-debug'),
         angular: nm_path + 'angular/angular' + hslMin,
         'angular-sanitize': nm_path + 'angular-sanitize/angular-sanitize' + hslMin,
@@ -37,7 +38,7 @@ if (require.config) require.config({
         'angular-socialshare': nm_path +'angular-socialshare/dist/angular-socialshare' + hslMin,
         'bottomSheetCollapsible': nm_path + 'angular-material-bottom-sheet-collapsible/bottomSheetCollapsible',
         hammer: nm_path +'hammerjs/hammer' + hslMin,
-        bootstrap: requirejs.s.contexts._.config.paths.bootstrap || nm_path +'bootstrap/dist/js/bootstrap' + hslMin,
+        bootstrap: requirejs.s.contexts._.config.paths.bootstrap || nm_path +'bootstrap/dist/js/bootstrap.bundle' + hslMin,
         draw: hsl_path + 'components/draw/draw',
         d3: requirejs.s.contexts._.config.paths.d3 || nm_path + 'd3/build/d3' + hslMin,
         'angular-cookies': nm_path + 'angular-cookies/angular-cookies' + hslMin,

diff --git a/examples/3d-kml/hslayers.js b/examples/3d-kml/hslayers.js
@@ -1,11 +1,16 @@
 'use strict';
 
 var hsl_path = '../../';
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/add-projection/hslayers.js b/examples/add-projection/hslayers.js
@@ -1,11 +1,16 @@
 'use strict';
 
 var hsl_path = '../../';
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/compositions/hslayers.js b/examples/compositions/hslayers.js
@@ -1,11 +1,16 @@
 'use strict';
 
 var hsl_path = '../../';
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+})
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/datasources/hslayers.js b/examples/datasources/hslayers.js
@@ -1,11 +1,16 @@
 'use strict';
 
 var hsl_path = '../../';
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+})
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/elf/hslayers.js b/examples/elf/hslayers.js
@@ -2,11 +2,16 @@
 
 var hsl_path = '../../';
 var allowWFS2 = true;
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     paths: {

diff --git a/examples/featureFilter/hslayers.js b/examples/featureFilter/hslayers.js
@@ -1,11 +1,16 @@
 'use strict';
 
 var hsl_path = '../../';
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/full/hslayers.js b/examples/full/hslayers.js
@@ -1,11 +1,16 @@
 'use strict';
 
 var hsl_path = '../../';
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/game_test/hslayers.js b/examples/game_test/hslayers.js
@@ -1,11 +1,16 @@
 'use strict';
 
 var hsl_path = '../../';
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/liberecMaterial/hslayers.js b/examples/liberecMaterial/hslayers.js
@@ -1,11 +1,16 @@
 'use strict';
 
 var hsl_path = '../../';
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/pilsen_traffic/hslayers.js b/examples/pilsen_traffic/hslayers.js
@@ -9,12 +9,15 @@ var hslMin = false;
 var pilsenSite = false;
 if(window.location.hostname.indexOf('intenzitadopravy.plzen.eu')>-1) pilsenSite = true;
 
-var gitsha = Math.random(); $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
-    dataType: 'text',
     url: hsl_path + 'gitsha.js',
-    async: false,
-    success: function(r){gitsha = r}
+    async: false
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
 });
 
 require.config({

diff --git a/examples/routing/hslayers.js b/examples/routing/hslayers.js
@@ -2,11 +2,16 @@
 
 var hsl_path = '../../';
 
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/senslog/hslayers.js b/examples/senslog/hslayers.js
@@ -2,11 +2,16 @@
 
 var hsl_path = '../../';
 
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
-    url: hsl_path + 'gitsha.js?t=' + Date.now(),
+    url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/socketio/hslayers.js b/examples/socketio/hslayers.js
@@ -2,11 +2,16 @@
 
 var hsl_path = '../../';
 
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
-    url: hsl_path + 'gitsha.js?t=' + Date.now(),
+    url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/split_map/hslayers.js b/examples/split_map/hslayers.js
@@ -2,11 +2,16 @@
 
 var hsl_path = '../../';
 
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
-    url: hsl_path + 'gitsha.js?t=' + Date.now(),
+    url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/tracking/hslayers.js b/examples/tracking/hslayers.js
@@ -2,11 +2,16 @@
 
 var hsl_path = '../../';
 
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
-    url: hsl_path + 'gitsha.js?t=' + Date.now(),
+    url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 require.config({
     urlArgs: 'bust=' + gitsha,

diff --git a/examples/webgl_viz/hslayers.js b/examples/webgl_viz/hslayers.js
@@ -2,11 +2,17 @@
 
 var hsl_path = '../../';
 
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
+
 var jans_path = 'http://home.zcu.cz/~jezekjan/webglayer-snaphsot1_1/js/'; //http://localhost:9999/js/webglayer/js/
 //  var jans_path = 'http://localhost:9999/js/webglayer/js/'
 

diff --git a/examples/webgl_viz2/hslayers.js b/examples/webgl_viz2/hslayers.js
@@ -2,11 +2,17 @@
 
 var hsl_path = '../../';
 
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
+
 //var jans_path = 'http://home.zcu.cz/~jezekjan/webglayer-snaphsot1_1/js/'; //http://localhost:9999/js/webglayer/js/
 var jans_path = 'http://home.zcu.cz/~jezekjan/webglayer_git/js/'
 

diff --git a/examples/wfs/hslayers.js b/examples/wfs/hslayers.js
@@ -1,11 +1,16 @@
 'use strict';
 
 var hsl_path = '../../';
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
 
 //https://github.com/tnajdek/angular-requirejs-seed
 require.config({

diff --git a/examples/wirecloud/hslayers.js b/examples/wirecloud/hslayers.js
@@ -1,11 +1,17 @@
 'use strict';
 
 var hsl_path = './';
-var gitsha = $.ajax({
+var gitsha;
+$.ajax({
     type: "GET",
     url: hsl_path + 'gitsha.js',
     async: false
-}).responseText;
+}).done(function (response) {
+    gitsha = response
+}).fail(function () {
+    gitsha = Math.random();
+});
+
 //https://github.com/tnajdek/angular-requirejs-seed
 require.config({
     urlArgs: 'bust=' + gitsha,