From f4d9e3495ab3dec8eba93c5d298c111a51a733ab Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Mon, 27 Jul 2015 22:34:44 -0700 Subject: [PATCH] Added shim for _ --- gulp/less.js | 6 +++--- src/UI/Shims/underscore.js | 4 ++++ webpack.config.js | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 src/UI/Shims/underscore.js diff --git a/gulp/less.js b/gulp/less.js index e689cc08b..2511c432e 100644 --- a/gulp/less.js +++ b/gulp/less.js @@ -22,7 +22,7 @@ gulp.task('less', function() { paths.src.root + 'Settings/settings.less', paths.src.root + 'System/Logs/logs.less', paths.src.root + 'System/Update/update.less', - paths.src.root + 'System/Info/info.less', + paths.src.root + 'System/Info/info.less' ]; if (phantom) { @@ -40,8 +40,8 @@ gulp.task('less', function() { paths.src.root + 'Settings/settings.less', paths.src.root + 'System/Logs/logs.less', paths.src.root + 'System/Update/update.less', - paths.src.root + 'System/Info/info.less', - ] + paths.src.root + 'System/Info/info.less' + ]; } return gulp.src(src) diff --git a/src/UI/Shims/underscore.js b/src/UI/Shims/underscore.js new file mode 100644 index 000000000..67b9b808b --- /dev/null +++ b/src/UI/Shims/underscore.js @@ -0,0 +1,4 @@ +var _ = require('../JsLibraries/lodash.underscore'); +window._ = window._ || _; + +module.exports = window._; \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index c265dd027..642c6e74d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -29,6 +29,7 @@ module.exports = { 'backbone.deepmodel': 'JsLibraries/backbone.deep.model', 'backbone.pageable': 'JsLibraries/backbone.pageable', 'backbone-pageable': 'JsLibraries/backbone.pageable', + 'backbone.paginator': 'JsLibraries/backbone.paginator', 'backbone.validation': 'Shims/backbone.validation', 'backbone.modelbinder': 'JsLibraries/backbone.modelbinder', 'backbone.collectionview': 'Shims/backbone.collectionview', @@ -37,12 +38,13 @@ module.exports = { 'backgrid.selectall': 'Shims/backbone.backgrid.selectall', 'fullcalendar': 'JsLibraries/fullcalendar', 'backstrech': 'JsLibraries/jquery.backstretch', - 'underscore': 'JsLibraries/lodash.underscore', + 'underscore': 'Shims/underscore', 'marionette': 'Shims/backbone.marionette', 'signalR': 'Shims/jquery.signalR', 'jquery-ui': 'JsLibraries/jquery-ui', 'jquery.knob': 'JsLibraries/jquery.knob', 'jquery.easypiechart': 'JsLibraries/jquery.easypiechart', + 'jquery.easypiechart': 'JsLibraries/jquery.easypiechart', 'jquery.dotdotdot': 'JsLibraries/jquery.dotdotdot', 'messenger': 'Shims/messenger', 'jquery': 'Shims/jquery',