From 5b58bd504d91e545de0bff0d0521c878f6ad6429 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 27 Jul 2015 22:56:44 -0700 Subject: [PATCH] Shim for deepmodel --- src/UI/Profile/ProfileModel.js | 2 +- .../DownloadClient/RemotePathMapping/RemotePathMappingModel.js | 2 +- src/UI/Settings/Indexers/Restriction/RestrictionModel.js | 2 +- src/UI/Settings/ProviderSettingsModelBase.js | 2 +- src/UI/Settings/SettingsModelBase.js | 2 +- webpack.config.js | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/UI/Profile/ProfileModel.js b/src/UI/Profile/ProfileModel.js index 43eaa7496..259e4be5f 100644 --- a/src/UI/Profile/ProfileModel.js +++ b/src/UI/Profile/ProfileModel.js @@ -1,6 +1,6 @@ var DeepModel = require('backbone.deepmodel'); -module.exports = DeepModel.DeepModel.extend({ +module.exports = DeepModel.extend({ defaults : { id : null, name : '', diff --git a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingModel.js b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingModel.js index 4b21eebae..e8ea08465 100644 --- a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingModel.js +++ b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingModel.js @@ -1,4 +1,4 @@ var $ = require('jquery'); var DeepModel = require('backbone.deepmodel'); -module.exports = DeepModel.DeepModel.extend({}); \ No newline at end of file +module.exports = DeepModel.extend({}); \ No newline at end of file diff --git a/src/UI/Settings/Indexers/Restriction/RestrictionModel.js b/src/UI/Settings/Indexers/Restriction/RestrictionModel.js index 4b21eebae..e8ea08465 100644 --- a/src/UI/Settings/Indexers/Restriction/RestrictionModel.js +++ b/src/UI/Settings/Indexers/Restriction/RestrictionModel.js @@ -1,4 +1,4 @@ var $ = require('jquery'); var DeepModel = require('backbone.deepmodel'); -module.exports = DeepModel.DeepModel.extend({}); \ No newline at end of file +module.exports = DeepModel.extend({}); \ No newline at end of file diff --git a/src/UI/Settings/ProviderSettingsModelBase.js b/src/UI/Settings/ProviderSettingsModelBase.js index fac3bd1bd..020cc438c 100644 --- a/src/UI/Settings/ProviderSettingsModelBase.js +++ b/src/UI/Settings/ProviderSettingsModelBase.js @@ -2,7 +2,7 @@ var $ = require('jquery'); var DeepModel = require('backbone.deepmodel'); var Messenger = require('../Shared/Messenger'); -module.exports = DeepModel.DeepModel.extend({ +module.exports = DeepModel.extend({ test : function() { var self = this; diff --git a/src/UI/Settings/SettingsModelBase.js b/src/UI/Settings/SettingsModelBase.js index 2166fa0fc..f08773f91 100644 --- a/src/UI/Settings/SettingsModelBase.js +++ b/src/UI/Settings/SettingsModelBase.js @@ -3,7 +3,7 @@ var DeepModel = require('backbone.deepmodel'); var AsChangeTrackingModel = require('../Mixins/AsChangeTrackingModel'); var Messenger = require('../Shared/Messenger'); -var model = DeepModel.DeepModel.extend({ +var model = DeepModel.extend({ initialize : function() { this.listenTo(vent, vent.Commands.SaveSettings, this.saveSettings); diff --git a/webpack.config.js b/webpack.config.js index 642c6e74d..ba7264e7e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -26,7 +26,7 @@ module.exports = { 'handlebars': 'Shims/handlebars', 'handlebars.helpers': 'JsLibraries/handlebars.helpers', 'bootstrap': 'JsLibraries/bootstrap', - 'backbone.deepmodel': 'JsLibraries/backbone.deep.model', + 'backbone.deepmodel': 'Shims/backbone.deep.model', 'backbone.pageable': 'JsLibraries/backbone.pageable', 'backbone-pageable': 'JsLibraries/backbone.pageable', 'backbone.paginator': 'JsLibraries/backbone.paginator', @@ -44,7 +44,6 @@ module.exports = { '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',