Merge branch 'master' into typescript

al42and · Apr 20, 2020 · 7f9e878 · 7f9e878
2 parents 955d265 + d79cc93
commit 7f9e878
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/browser/app.js b/browser/app.js
@@ -1,7 +1,7 @@
 define('app', [
-  'jquery', 'backbone', 'backbone.marionette', 'socket.io-client',
+  'jquery', 'underscore', 'backbone', 'backbone.marionette', 'socket.io-client',
   'map', 'vent', 'reqres', 'models', 'views/panel', 'views/map', 'config', 'utils/isMobile'
-], function ($, backbone, marionette, io, map, vent, reqres, models, panelViews, mapViews, config, isMobile) {
+], function ($, _, backbone, marionette, io, map, vent, reqres, models, panelViews, mapViews, config, isMobile) {
 
   var App = marionette.Application.extend({
     initData: function () {

diff --git a/browser/index.html b/browser/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <title>Manula Tracker</title>
-    <script src="http://api-maps.yandex.ru/2.1-dev/?load=package.full&lang=ru-RU" type="text/javascript"></script>
+    <script src="https://api-maps.yandex.ru/2.1-dev/?load=package.full&lang=ru-RU" type="text/javascript"></script>
     <meta charset="UTF-8">
     <!-- build:template
     <script src="scripts-<%= revision %>.js"></script>

diff --git a/browser/package.json b/browser/package.json
@@ -16,7 +16,7 @@
     "grunt-contrib-cssmin": "~3.0.0",
     "grunt-contrib-requirejs": "~1.0.0",
     "grunt-processhtml": "~0.4.2",
-    "underscore": "^1.6.0",
+    "underscore": "1.9.2",
     "almond": "~0.3.3",
     "raven-js": "^1.1.15",
     "requirejs": "~2.3.6",
@@ -27,7 +27,7 @@
     "backbone.wreqr": "1.4.0",
     "backbone.marionette": "2.1.0",
     "backbone.modelbinder": "1.1.0",
-    "jquery-simple-color": "recurser/jquery-simple-color#^1.2.2",
+    "jquery-simple-color": "recurser/jquery-simple-color#1.2.1",
     "requirejs-json": "~0.0.3"
   },
   "repository": {

diff --git a/browser/require.config.js b/browser/require.config.js
@@ -21,6 +21,9 @@ require.config({
     'jquery-simple-color': {
       deps: ['jquery'],
       exports: '$.fn.simpleColor'
-    }
+    },
+    'underscore': {
+      exports: '_'
+    },
   }
 });