Fix map menu not clickable (kartoza#349)

dimasciput · Sep 13, 2018 · 082b105 · 082b105
1 parent 580ee73
commit 082b105
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 51 deletions.
diff --git a/bims/static/js/app.js b/bims/static/js/app.js
@@ -12,6 +12,11 @@ require.config({
         chartJs: 'libs/chart/Chart-2.7.2'
     },
     shim: {
+        bootstrap: {
+            deps: [
+                'jquery'
+            ]
+        },
         ol: {
             exports: ['ol']
         },
@@ -21,8 +26,7 @@ require.config({
         backbone: {
             deps: [
                 'underscore',
-                'jquery',
-                'bootstrap'
+                'jquery'
             ],
             exports: 'Backbone'
         },
@@ -41,11 +45,12 @@ require.config({
 });
 
 require([
+    'bootstrap',
     'router',
     'views/olmap',
     'shared',
     'app'
-], function (Router, olmap, Shared, App) {
+], function (Bootstrap, Router, olmap, Shared, App) {
     // Display the map
     Shared.Router = new Router();
 

diff --git a/bims/static/js/optimized.js b/bims/static/js/optimized.js
diff --git a/bims/static/js/views/biodiversity_legend.js b/bims/static/js/views/biodiversity_legend.js
@@ -1,11 +1,13 @@
 define([
     'backbone',
     'underscore',
-    'shared'
+    'shared',
+    'jquery'
     ], function (
         Backbone,
         _,
-        Shared
+        Shared,
+        $
         ) {
    return Backbone.View.extend({
        template: _.template($('#biodiversity-legend').html()),

diff --git a/bims/static/js/views/catchment_area_control.js b/bims/static/js/views/catchment_area_control.js
@@ -1,4 +1,4 @@
-define(['backbone', 'ol', 'shared'], function (Backbone, ol, Shared) {
+define(['backbone', 'ol', 'shared', 'jquery'], function (Backbone, ol, Shared, $) {
     return Backbone.View.extend({
         catchmentAreaBoundaryUrl: "/api/boundary/geojson?ids=",
         initialize: function () {

diff --git a/bims/static/js/views/cluster.js b/bims/static/js/views/cluster.js
@@ -1,4 +1,4 @@
-define(['backbone', 'models/cluster', 'ol', 'shared'], function (Backbone, Cluster, ol, Shared) {
+define(['backbone', 'models/cluster', 'ol', 'shared', 'jquery'], function (Backbone, Cluster, ol, Shared, $) {
     return Backbone.View.extend({
         initialize: function (options) {
             this.render();

diff --git a/bims/static/js/views/data_downloader-modal.js b/bims/static/js/views/data_downloader-modal.js
@@ -1,4 +1,4 @@
-define(['shared', 'backbone', 'underscore', 'jqueryUi'], function (Shared, Backbone, _) {
+define(['shared', 'backbone', 'underscore', 'jquery', 'jqueryUi'], function (Shared, Backbone, _, $, JqueryUI) {
     return Backbone.View.extend({
         template: _.template($('#download-control-panel-template').html()),
         url: '/api/collection/download/',

diff --git a/bims/static/js/views/geocontext.js b/bims/static/js/views/geocontext.js
@@ -1,4 +1,4 @@
-define(['backbone', 'underscore', 'shared', 'ol'], function (Backbone, _, Shared, ol) {
+define(['backbone', 'underscore', 'shared', 'ol', 'jquery'], function (Backbone, _, Shared, ol, $) {
     return Backbone.View.extend({
         geocontextUrl: _.template(
             "<%= geocontextUrl %>/api/v1/geocontext/value/collection/<%= latitude %>/<%= longitude %>/<%= geocontextCollectionKey %>"),

diff --git a/bims/static/js/views/search.js b/bims/static/js/views/search.js
@@ -1,6 +1,6 @@
 define([
-    'backbone', 'underscore', 'shared', 'ol', 'noUiSlider', 'collections/search_result', 'views/search_panel'
-], function (Backbone, _, Shared, ol, NoUiSlider, SearchResultCollection, SearchPanelView) {
+    'backbone', 'underscore', 'shared', 'ol', 'noUiSlider', 'collections/search_result', 'views/search_panel', 'jquery'
+], function (Backbone, _, Shared, ol, NoUiSlider, SearchResultCollection, SearchPanelView, $) {
 
     return Backbone.View.extend({
         template: _.template($('#map-search-container').html()),

diff --git a/bims/static/js/views/search_panel.js b/bims/static/js/views/search_panel.js
@@ -1,5 +1,5 @@
 define(['shared', 'backbone', 'underscore', 'jqueryUi',
-    'views/catchment_area_control'], function (Shared, Backbone, _, jqueryUi, CatchmentAreaControl) {
+    'views/catchment_area_control', 'jquery'], function (Shared, Backbone, _, jqueryUi, CatchmentAreaControl, $) {
     return Backbone.View.extend({
         template: _.template($('#map-search-result-template').html()),
         events: {

diff --git a/bims/static/js/views/search_result.js b/bims/static/js/views/search_result.js
@@ -1,4 +1,4 @@
-define(['backbone', 'models/search_result', 'shared', 'underscore', 'ol'], function (Backbone, SearchResult, Shared, _, ol) {
+define(['backbone', 'models/search_result', 'shared', 'underscore', 'ol', 'jquery'], function (Backbone, SearchResult, Shared, _, ol, $) {
     return Backbone.View.extend({
         id: 0,
         data: null,

diff --git a/bims/static/js/views/side_panel.js b/bims/static/js/views/side_panel.js
@@ -1,4 +1,4 @@
-define(['shared', 'backbone', 'underscore', 'jqueryUi'], function (Shared, Backbone, _) {
+define(['shared', 'backbone', 'underscore', 'jqueryUi', 'jquery'], function (Shared, Backbone, _, JqueryUI, $) {
     return Backbone.View.extend({
         template: _.template($('#side-panel-template').html()),
         className: 'panel-wrapper',