summaryrefslogtreecommitdiffstats
path: root/pyload/web/app/scripts/views/dashboard
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/web/app/scripts/views/dashboard')
-rw-r--r--pyload/web/app/scripts/views/dashboard/dashboardView.js4
-rw-r--r--pyload/web/app/scripts/views/dashboard/filterView.js13
-rw-r--r--pyload/web/app/scripts/views/dashboard/selectionView.js2
3 files changed, 11 insertions, 8 deletions
diff --git a/pyload/web/app/scripts/views/dashboard/dashboardView.js b/pyload/web/app/scripts/views/dashboard/dashboardView.js
index f305ac2f4..a7779230b 100644
--- a/pyload/web/app/scripts/views/dashboard/dashboardView.js
+++ b/pyload/web/app/scripts/views/dashboard/dashboardView.js
@@ -5,9 +5,6 @@ define(['jquery', 'backbone', 'underscore', 'app', 'models/TreeCollection',
// Renders whole dashboard
return Backbone.Marionette.ItemView.extend({
- // TODO: refactor
- active: $('.breadcrumb .active'),
-
template: template,
events: {
@@ -106,7 +103,6 @@ define(['jquery', 'backbone', 'underscore', 'app', 'models/TreeCollection',
pack.fetch({silent: true, success: function() {
console.log('Package ' + pack.get('pid') + ' loaded');
- self.active.text(pack.get('name'));
self.contentReady(pack.get('files'));
}, failure: function() {
self.failure();
diff --git a/pyload/web/app/scripts/views/dashboard/filterView.js b/pyload/web/app/scripts/views/dashboard/filterView.js
index ceb2a9a6e..79257547c 100644
--- a/pyload/web/app/scripts/views/dashboard/filterView.js
+++ b/pyload/web/app/scripts/views/dashboard/filterView.js
@@ -26,7 +26,8 @@ define(['jquery', 'backbone', 'underscore', 'app', 'utils/apitypes', 'models/Pac
ui: {
'search': '.search-query',
'stateMenu': '.dropdown-toggle .state',
- 'select': '.btn-check'
+ 'select': '.btn-check',
+ 'name': '.breadcrumb .active'
},
template: template,
@@ -36,11 +37,12 @@ define(['jquery', 'backbone', 'underscore', 'app', 'utils/apitypes', 'models/Pac
this.state = Api.DownloadState.All;
// Apply the filter before the content is shown
- App.vent.on('dashboard:contentReady', _.bind(this.apply_filter, this));
+ this.listenTo(App.vent, 'dashboard:contentReady', this.apply_filter);
+ this.listenTo(App.vent, 'dashboard:updated', this.updateName);
},
onRender: function() {
- // use our modified method
+ // use our modified method
$.fn.typeahead.Constructor.prototype.show = show;
this.ui.search.typeahead({
minLength: 2,
@@ -127,6 +129,11 @@ define(['jquery', 'backbone', 'underscore', 'app', 'utils/apitypes', 'models/Pac
return true;
},
+ updateName: function() {
+ // TODO
+// this.ui.name.text(App.dashboard.package.get('name'));
+ },
+
toggle_selection: function() {
App.vent.trigger('selection:toggle');
},
diff --git a/pyload/web/app/scripts/views/dashboard/selectionView.js b/pyload/web/app/scripts/views/dashboard/selectionView.js
index f25bf3cca..25b7998df 100644
--- a/pyload/web/app/scripts/views/dashboard/selectionView.js
+++ b/pyload/web/app/scripts/views/dashboard/selectionView.js
@@ -100,7 +100,7 @@ define(['jquery', 'backbone', 'underscore', 'app', 'hbs!tpl/dashboard/select'],
},
trash: function() {
- _.confirm('default/confirmDialog.html', function() {
+ _.confirm('dialogs/confirmDelete', function() {
var pids = [];
// TODO: delete many at once