Changeset 12832

Timestamp:

Sep 3, 2011, 4:33:04 AM (12 years ago)

Author:

jordan

Message:

(trunk web) better encapsulation of FileRow? -- make most of its fields and methods private. transmission.js and remote.js don't know about FileRow? anymore.

Location:

trunk/web/javascript

Files:

• file-row.js (modified) (6 diffs)
• inspector.js (modified) (2 diffs)
• remote.js (modified) (1 diff)
• transmission.js (modified) (1 diff)

trunk/web/javascript/file-row.js

@@ -7 +7 @@
 function FileRow(torrent, i)
 {
-        this.initialize(torrent, i);
-}
-
-FileRow.prototype =
-{
-        initialize: function(torrent, i)
-        {
-                this._torrent = torrent;
-                this._index = i;
-                this.createRow(torrent, i);
+        var fields = {
+                have: 0,
+                index: 0,
+                isDirty: false,
+                isWanted: true,
+                priority: 0,
+                me: this,
+                size: 0,
+                torrent: null
         },
 
-        getTorrent: function()
-        {
-                return this._torrent;
-        },
-        getIndex: function()
-        {
-                return this._index;
+        elements = {
+                priority_control: null,
+                progress: null,
+                root: null
         },
 
-        readAttributes: function(file)
-        {
-                if (file.index !== undefined && file.index !== this._index) {
-                        this._index = file.index;
-                        this._dirty = true;
+        initialize = function(torrent, i) {
+                fields.torrent = torrent;
+                fields.index = i;
+                createRow(torrent, i);
+        },
+
+        readAttributes = function(file) {
+                if (fields.have !== file.bytesCompleted) {
+                        fields.have = file.bytesCompleted;
+                        fields.isDirty = true;
                 }
-                if (file.bytesCompleted !== undefined && file.bytesCompleted !== this._done) {
-                        this._done   = file.bytesCompleted;
-                        this._dirty = true;
+                if (fields.size !== file.length) {
+                        fields.size = file.length;
+                        fields.isDirty = true;
                 }
-                if (file.length !== undefined && file.length !== this._size) {
-                        this._size   = file.length;
-                        this._dirty = true;
+                if (fields.priority !== file.priority) {
+                        fields.priority = file.priority;
+                        fields.isDirty = true;
                 }
-                if (file.priority !== undefined && file.priority !== this._prio) {
-                        this._prio   = file.priority;
-                        this._dirty = true;
-                }
-                if (file.wanted !== undefined && file.wanted !== this._wanted) {
-                        this._wanted = file.wanted;
-                        this._dirty = true;
+                if (fields.isWanted !== file.wanted) {
+                        fields.isWanted = file.wanted;
+                        fields.isDirty = true;
                 }
         },
 
-        refreshWantedHTML: function()
+        refreshWantedHTML = function()
         {
-                var e = this.getElement(),
+                var e = elements.root,
                     c = [ e.classNameConst ];
 
-                if (!this._wanted) { c.push('skip'); }
-                if (this.isDone()) { c.push('complete'); }
+                if (!fields.isWanted) { c.push('skip'); }
+                if (isDone()) { c.push('complete'); }
                 e.className = c.join(' ');
         },
-        refreshPriorityHTML: function()
+        refreshPriorityHTML = function()
         {
-                var e = this._priority_control,
+                var e = elements.priority_control,
                     c = [ e.classNameConst ];
 
-                switch(this._prio) {
+                switch(fields.priority) {
                         case -1 : c.push('low'); break;
                         case 1  : c.push('high'); break;
@@ -73 +70 @@
                 e.className = c.join(' ');
         },
-        refreshProgressHTML: function()
+        refreshProgressHTML = function()
         {
-                var pct = 100 * (this._size ? (this._done / this._size) : 1.0),
-                    c = [ Transmission.fmt.size(this._done),
+                var pct = 100 * (fields.size ? (fields.have / fields.size) : 1.0),
+                    c = [ Transmission.fmt.size(fields.have),
                           ' of ',
-                          Transmission.fmt.size(this._size),
+                          Transmission.fmt.size(fields.size),
                           ' (',
                           Transmission.fmt.percentString(pct),
                           '%)' ].join('');
-                setInnerHTML(this._progress[0], c);
+                setInnerHTML(elements.progress, c);
         },
-        refreshHTML: function() {
-                if (this._dirty) {
-                        this._dirty = false;
-                        this.refreshProgressHTML();
-                        this.refreshWantedHTML();
-                        this.refreshPriorityHTML();
+        refreshHTML = function() {
+                if (fields.isDirty) {
+                        fields.isDirty = false;
+                        refreshProgressHTML();
+                        refreshWantedHTML();
+                        refreshPriorityHTML();
                 }
         },
-        refresh: function()
-        {
-                var i = this.getIndex(),
-                    t = this.getTorrent();
-                this.readAttributes(t.getFile(i));
-                this.refreshHTML();
+        refresh = function() {
+                readAttributes(fields.torrent.getFile(fields.index));
+                refreshHTML();
         },
 
-        isDone: function () {
-                return this._done >= this._size;
-        },
-        isEditable: function () {
-                return (this.getTorrent().getFileCount()>1) && !this.isDone();
+        isDone = function () {
+                return fields.have >= fields.size;
         },
 
-        createRow: function(torrent, i)
-        {
-                var me = this,
-                    file = torrent.getFile(i),
+        createRow = function(torrent, i) {
+                var file = torrent.getFile(i),
                     name, root, wanted_div, pri_div, file_div, prog_div;
 
                 root = document.createElement('li');
-                root.id = 't' + this._torrent.getId() + 'f' + this._index;
+                root.id = 't' + fields.torrent.getId() + 'f' + fields.index;
                 root.classNameConst = 'inspector_torrent_file_list_entry ' + ((i%2)?'odd':'even');
                 root.className = root.classNameConst;
@@ -120 +109 @@
                 wanted_div = document.createElement('div');
                 wanted_div.className = "file_wanted_control";
-                $(wanted_div).bind('click',function(){ me.fireWantedChanged(!me._wanted); });
+                $(wanted_div).click(function(){ fireWantedChanged(!fields.isWanted); });
 
                 pri_div = document.createElement('div');
@@ -133 +122 @@
                                 e = e.offsetParent;
                         }
+                        // ugh.
                         if (isMobileDevice) {
                                 if (x < 8) prio = -1;
@@ -142 +132 @@
                                 else prio = 1;
                         }
-                        me.firePriorityChanged(prio);
+                        firePriorityChanged(prio);
                 });
 
@@ -160 +150 @@
                 root.appendChild(prog_div);
 
-                this._element = root;
-                this._priority_control = pri_div;
-                this._progress = $(prog_div);
+                elements.root = root;
+                elements.priority_control = pri_div;
+                elements.progress = prog_div;
 
-                this.refresh();
+                refresh();
                 return root;
         },
 
-        getElement: function()
-        {
-                return this._element;
+        fireWantedChanged = function(do_want) {
+                $(fields.me).trigger('wantedToggled',[ fields.me, do_want ]);
         },
+        firePriorityChanged = function(priority) {
+                $(fields.me).trigger('priorityToggled',[ fields.me, priority ]);
+        };
 
-        fireWantedChanged: function(do_want)
-        {
-                $(this).trigger('wantedToggled',[ this, do_want ]);
-        },
-        firePriorityChanged: function(priority)
-        {
-                $(this).trigger('priorityToggled',[ this, priority ]);
-        }
+        /***
+        ****  PUBLIC
+        ***/
+
+        this.getElement = function() {
+                return elements.root;
+        };
+        this.getIndex = function() {
+                return fields.index;
+        };
+        this.isEditable = function () {
+                return (fields.torrent.getFileCount()>1) && !isDone();
+        };
+
+        initialize(torrent, i);
 };

trunk/web/javascript/inspector.js

@@ -202 +202 @@
     filesDeselectAllClicked = function() { filesAllClicked(false); },
     filesAllClicked = function(s) {
-        var t = data.file_torrent;
-        if (t)
-            toggleFilesWantedDisplay(t, s);
-    },
-
-    changeFileCommand = function(command, rows) {
-        data.controller.changeFileCommand(command, rows);
-    },
-
-    toggleFilesWantedDisplay = function(torrent, wanted) {
-        var i, row, rows=[];
+        var i, row, rows=[], t=data.file_torrent;
+        if (!t)
+                return;
         for (i=0; row=data.file_rows[i]; ++i)
-            if (row.isEditable() && (torrent.getFile(i).wanted !== wanted))
+            if (row.isEditable() && (t.getFile(i).wanted !== s))
                 rows.push(row);
         if (rows.length > 0)
-            changeFileCommand(wanted?'files-wanted':'files-unwanted', rows);
+            changeFileCommand(rows, s?'files-wanted':'files-unwanted');
+    },
+
+    changeFileCommand = function(rows, command) {
+        var torrentId = data.file_torrent.getId();
+        var rowIndices = $.map(rows.slice(0),function (row) {return row.getIndex();});
+        data.controller.changeFileCommand(torrentId, rowIndices, command);
     },
 
     onFileWantedToggled = function(row, want) {
-        changeFileCommand(want ? 'files-wanted' : 'files-unwanted',  [row]);
+        changeFileCommand([row], want?'files-wanted':'files-unwanted');
     },
 
@@ -231 +229 @@
             default: command = 'priority-normal'; break;
         }
-        changeFileCommand(command, [ row ]);
+        changeFileCommand([row], command);
     },
 

trunk/web/javascript/remote.js

@@ -147 +147 @@
         },
 
-        changeFileCommand: function(command, rows) {
-                var remote = this;
-                var torrent_ids = [ rows[0].getTorrent().getId() ];
-                var files = [];
-                for (var i=0, row; row=rows[i]; ++i)
-                        files.push(row.getIndex());
-                var o = {
-                        method: 'torrent-set',
-                        arguments: { ids: torrent_ids }
-                };
-                o.arguments[command] = files;
-                this.sendRequest(o, function() {
+        changeFileCommand: function(torrentId, fileIndices, command) {
+                var remote = this,
+                    args = { ids: [torrentId] };
+                args[command] = fileIndices;
+                this.sendRequest({
+                        arguments: args,
+                        method: 'torrent-set'
+                }, function() {
                         remote._controller.refreshTorrents(torrent_ids);
                 });

trunk/web/javascript/transmission.js

@@ -1263 +1263 @@
                                          this.refreshTorrents, this);
         },
-        changeFileCommand: function(command, rows) {
-                this.remote.changeFileCommand(command, rows);
+        changeFileCommand: function(torrentId, rowIndices, command) {
+                this.remote.changeFileCommand(torrentId, rowIndices, command);
         },