diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-12-07 18:26:19 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-12-07 18:26:19 +0100 |
| commit | d085083f1cbe495f73a12782c077e5dc4e277898 (patch) | |
| tree | 12bef75d9bcc28d46a70c5355a68e334c3a8b199 | |
| parent | render links updated to package (diff) | |
| download | pyload-d085083f1cbe495f73a12782c077e5dc4e277898.tar.xz | |
fixed dependencies, downgraded hbs plugin
| -rw-r--r-- | pyload/web/app/scripts/config.js | 6 | ||||
| -rw-r--r-- | pyload/web/app/scripts/views/dashboard/dashboardView.js | 1 | ||||
| -rw-r--r-- | pyload/web/bower.json | 2 | ||||
| -rw-r--r-- | pyload/web/package.json | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/pyload/web/app/scripts/config.js b/pyload/web/app/scripts/config.js index 85620b2b7..2f5745c08 100644 --- a/pyload/web/app/scripts/config.js +++ b/pyload/web/app/scripts/config.js @@ -34,6 +34,12 @@ require.config({ tpl: '../templates/default' }, + map: { + '*': { + 'Handlebars': 'handlebars' + } + }, + hbs: { disableI18n: true, helperPathCallback: // Callback to determine the path to look for helpers diff --git a/pyload/web/app/scripts/views/dashboard/dashboardView.js b/pyload/web/app/scripts/views/dashboard/dashboardView.js index e1312fd2c..12371c668 100644 --- a/pyload/web/app/scripts/views/dashboard/dashboardView.js +++ b/pyload/web/app/scripts/views/dashboard/dashboardView.js @@ -181,7 +181,6 @@ define(['jquery', 'backbone', 'underscore', 'app', 'models/TreeCollection', 'col App.vent.trigger('dashboard:destroyContent'); }, - // TODO: render inserted files // reload the package onPackageUpdated: function(pid) { var self = this; diff --git a/pyload/web/bower.json b/pyload/web/bower.json index fe5641cb2..41122adba 100644 --- a/pyload/web/bower.json +++ b/pyload/web/bower.json @@ -5,7 +5,7 @@ "pyload-common": "https://github.com/pyload/pyload-common.git", "requirejs": "2.1.9", "requirejs-text": "*", - "require-handlebars-plugin": "*", + "require-handlebars-plugin": "0.4.0", "jquery": "~1.9.1", "jquery.transit": "~0.9.9", "jquery.cookie": "~1.3.1", diff --git a/pyload/web/package.json b/pyload/web/package.json index e1a2defb7..5de79a814 100644 --- a/pyload/web/package.json +++ b/pyload/web/package.json @@ -17,7 +17,7 @@ "grunt-contrib-connect": "~0.2.0", "grunt-contrib-clean": "~0.4.0", "grunt-contrib-htmlmin": "~0.1.3", - "grunt-contrib-requirejs": "~0.4.0", + "grunt-contrib-requirejs": "~0.4.1", "grunt-contrib-imagemin": "~0.1.3", "grunt-contrib-watch": "~0.4.0", "grunt-contrib-compress": "~0.5.0", |