Changeset dd1716

Timestamp:

04/19/2010 02:35:33 PM (15 years ago)

Author:

Damien Churchill <damoxc@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

76483b

Parents:

c176ff

git-author:

Damien Churchill <damoxc@gmail.com> (04/19/2010 12:59:21 PM)

git-committer:

Damien Churchill <damoxc@gmail.com> (04/19/2010 02:35:33 PM)

Message:

improve the selective downloading adding support for directories and don't recreate treenodes

Location:

deluge/ui/web/js/deluge-all/add

Files:

• FilesTab.js (modified) (2 diffs)
• OptionsPanel.js (modified) (2 diffs)

deluge/ui/web/js/deluge-all/add/FilesTab.js

@@ -66 +66 @@
                 tpl: new Ext.XTemplate('{download:this.format}', {
                         format: function(v) {
-                                return '<div class="x-grid3-check-col'+(v?'-on':'')+'"> </div>';
+                                return '<div rel="chkbox" class="x-grid3-check-col'+(v?'-on':'')+'"> </div>';
                         }
                 })
@@ -85 +85 @@
         },
 
-        onNodeClick: function(node, e) {
-                node.attributes.download = !node.attributes.download;
-                var newNode = new Ext.tree.TreeNode(node.attributes);
-                node.parentNode.replaceChild(newNode, node);
-                this.fireEvent('filechecked', newNode, node.attributes.download, !node.attributes.download);
+        setDownload: function(node, value) {
+                node.attributes.download = value;
+                node.ui.updateColumns();
+
+                if (node.isLeaf()) {
+                        return this.fireEvent('filechecked', node, value, !value);
+                } else {
+                        node.cascade(function(n) {
+                                n.attributes.download = value;
+                                n.ui.updateColumns();
+                                return this.fireEvent('filechecked', n, value, !value);
+                        }, this);
+                }
         },
 
-        onFolderCheck: function(node, checked) {
-                var priorities = this.optionsManager.get('file_priorities');
-                node.cascade(function(child) {
-                        if (!child.ui.checkbox) {
-                                child.attributes.checked = checked;
-                        } else {
-                                child.ui.checkbox.checked = checked;
-                        }
-                        priorities[child.attributes.fileindex] = checked;
-                }, this);
-                this.optionsManager.setDefault('file_priorities', priorities);
+        onNodeClick: function(node, e) {
+                var el = new Ext.Element(e.target);
+                if (el.getAttribute('rel') == 'chkbox') {
+                        this.setDownload(node, !node.attributes.download);
+                }
         }
 });

deluge/ui/web/js/deluge-all/add/OptionsPanel.js

@@ -98 +98 @@
 
                 this.walkFileTree(this.torrents[torrentId]['files_tree'], function(filename, type, entry, parentNode) {
-                        if (type == 'dir') {
-                                var folder = new Ext.tree.TreeNode({
-                                        filename: filename,
-                                        size: entry.length,
-                                        download: true
-                                });
-                                folder.on('checkchange', this.onFolderCheck, this);
-                                parentNode.appendChild(folder);
-                                return folder;
-                        } else {
-                                var node = new Ext.tree.TreeNode({
-                                        filename: filename,
-                                        fileindex: entry.index,
-                                        size: entry.length,
-                                        leaf: true,
-                                        download: priorities[entry.index],
-                                        uiProvider: Ext.tree.ColumnNodeUI
-                                });
-                                node.on('checkchange', this.onNodeCheck, this);
-                                parentNode.appendChild(node);
-                        }
+                        var node = new Ext.tree.TreeNode({
+                                download:  (entry.index) ? priorities[entry.index] : true,
+                                filename:  filename,
+                                fileindex: entry.index,
+                                leaf:      type != 'dir',
+                                size:      entry.length
+                        });
+                        parentNode.appendChild(node);
+                        if (type == 'dir') return node;
                 }, this, root);
                 root.firstChild.expand();
@@ -139 +127 @@
 
         onFileChecked: function(node, newValue, oldValue) {
+                if (!Ext.isNumber(node.attributes.fileindex)) return;
+
+//              if (this.form.optionsManager.get('compact_allocation')) {
+//                      Ext.Msg.show({
+//                              title: _('Unable to set file priority!'),
+//                              msg:   _('File prioritization is unavailable when using Compact allocation. Would you like to switch to Full allocation?'),
+//                              buttons: Ext.Msg.YESNO,
+//                              fn: function(result) {
+//                                      if (result == 'yes') {
+//                                              var priorities = this.form.optionsManager.get('file_priorities');
+//                                              priorities[node.attributes.fileindex] = (result) ? newValue : oldValue;
+//                                              this.form.optionsManager.update('file_priorities', priorities);
+//                                      } else {
+//                                              node.attributes.download = oldValue;
+//                                              node.ui.updateColumns();
+//                                      }       
+//                              },
+//                              scope: this,
+//                              icon: Ext.MessageBox.QUESTION
+//                      });
+//              } else {
+//                      var priorities = this.form.optionsManager.get('file_priorities');
+//                      priorities[node.attributes.fileindex] = newValue;
+//                      this.form.optionsManager.update('file_priorities', priorities);
+//              }
                 var priorities = this.form.optionsManager.get('file_priorities');
                 priorities[node.attributes.fileindex] = newValue;