From c8691b220c882b47cdae460131c863cec5aa7fde Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 22 Dec 2012 23:14:59 +0100 Subject: improved dashboard a little --- module/web/static/js/views/packageTreeView.js | 186 +++++++++++++------------- module/web/static/js/views/packageView.js | 2 +- 2 files changed, 94 insertions(+), 94 deletions(-) (limited to 'module/web/static/js') diff --git a/module/web/static/js/views/packageTreeView.js b/module/web/static/js/views/packageTreeView.js index 516c2f5d1..92e4d78a0 100644 --- a/module/web/static/js/views/packageTreeView.js +++ b/module/web/static/js/views/packageTreeView.js @@ -1,94 +1,94 @@ -define(['jquery', 'backbone', 'underscore', 'models/TreeCollection', 'views/packageView', 'views/fileView'], - function($, Backbone, _, TreeCollection, packageView, fileView) { - - // Renders whole PackageView - return Backbone.View.extend({ - - el: '#content', - - events: { - 'click #add': 'addPackage', - 'keypress #name': 'addOnEnter', - 'click #show_active': 'filter' - }, - - initialize: function() { - this.tree = new TreeCollection(); - - }, - - init: function() { - var self = this; - this.tree.fetch({success: function() { - self.render(); - }}); - }, - - render: function() { - var packs = this.tree.get('packages'), - files = this.tree.get('files'), - el = this.$('#dashboard'); - - el.empty(); - el.append($('Root: ' + this.tree.get('root').get('name') + ' ')); - el.append($('')); - el.append($(' Add
')); - - var ul = $(''); - packs.each(function(pack) { - ul.append(new packageView({model: pack}).render().el); - }); - - el.append(ul); - el.append($('
Files: ' + files.size() + '
')); - - ul = $(''); - files.each(function(file) { - ul.append(new fileView({model: file}).render().el); - }); - - el.append(ul); - $('#name').focus(); - - return this; - }, - - addOnEnter: function(e) { - if (e.keyCode != 13) return; - this.addPackage(e); - }, - - addPackage: function(e) { - var self = this; - var settings = { - type: 'POST', - data: { - name: JSON.stringify($('#name').val()), - links: JSON.stringify(['http://download.pyload.org/random.bin', 'invalid link']) - }, - success: function() { - self.tree.fetch({success: function() { - self.render(); - }}); - } - }; - - $.ajax('api/addPackage', settings); - $('#name').val(''); - }, - - toggle: false, - - filter: function(e) { - var self = this; - this.tree.get('packages').each(function(item){ - if(!self.toggle) - item.trigger('filter:added'); - else - item.trigger('filter:removed'); - - }); - self.toggle ^= true; - } - }); +define(['jquery', 'backbone', 'underscore', 'models/TreeCollection', 'views/packageView', 'views/fileView'], + function($, Backbone, _, TreeCollection, packageView, fileView) { + + // Renders whole PackageView + return Backbone.View.extend({ + + el: '#content', + + events: { + 'click #add': 'addPackage', + 'keypress #name': 'addOnEnter', + 'click #show_active': 'filter' + }, + + initialize: function() { + this.tree = new TreeCollection(); + + }, + + init: function() { + var self = this; + this.tree.fetch({success: function() { + self.render(); + }}); + }, + + render: function() { + var packs = this.tree.get('packages'), + files = this.tree.get('files'), + el = this.$('#dashboard'); + + /* el.empty(); + el.append($('Root: ' + this.tree.get('root').get('name') + ' ')); + el.append($('')); + el.append($(' Add
'));*/ + + var ul = $(''); + packs.each(function(pack) { + ul.append(new packageView({model: pack}).render().el); + }); + + el.append(ul); + el.append($('
Files: ' + files.size() + '
')); + + ul = $(''); + files.each(function(file) { + ul.append(new fileView({model: file}).render().el); + }); + + el.append(ul); + $('#name').focus(); + + return this; + }, + + addOnEnter: function(e) { + if (e.keyCode != 13) return; + this.addPackage(e); + }, + + addPackage: function(e) { + var self = this; + var settings = { + type: 'POST', + data: { + name: JSON.stringify($('#name').val()), + links: JSON.stringify(['http://download.pyload.org/random.bin', 'invalid link']) + }, + success: function() { + self.tree.fetch({success: function() { + self.render(); + }}); + } + }; + + $.ajax('api/addPackage', settings); + $('#name').val(''); + }, + + toggle: false, + + filter: function(e) { + var self = this; + this.tree.get('packages').each(function(item){ + if(!self.toggle) + item.trigger('filter:added'); + else + item.trigger('filter:removed'); + + }); + self.toggle ^= true; + } + }); }); \ No newline at end of file diff --git a/module/web/static/js/views/packageView.js b/module/web/static/js/views/packageView.js index efbf6b76e..154e7af77 100644 --- a/module/web/static/js/views/packageView.js +++ b/module/web/static/js/views/packageView.js @@ -8,7 +8,7 @@ define(['jquery', 'views/abstract/itemView', 'underscore', 'views/fileView'], className: 'package-view', template: _.compile($("#template-package").html()), events: { - 'click .package-header': 'load', + 'click .package-row.first': 'load', 'click .delete': 'delete' }, -- cgit v1.2.3