Changeset 8500

Timestamp:

May 23, 2009, 8:39:55 PM (14 years ago)

Author:

charles

Message:

(trunk web) #2052: "warning: unresponsive script". what's new in this iteration: ​http://trac.transmissionbt.com/ticket/2052#comment:10

Location:

trunk/web/javascript

Files:

• torrent.js (modified) (9 diffs)
• transmission.js (modified) (4 diffs)

trunk/web/javascript/torrent.js

@@ -37 +37 @@
                 this._name          = data.name;
                 this._name_lc       = this._name.toLowerCase( );
-
+                this._file_model    = [ ];
+                this._file_view     = [ ];
 
                 // Create a new <li> element
@@ -105 +106 @@
                 this._controller._torrent_list.appendChild( top_e );
 
-                this._files = [];
                 this.initializeTorrentFilesInspectorGroup();
-                if(data.files){
-                        if(data.files.length == 1)
-                                this._fileList.className += ' single_file';
-                        for (var i = 0; i < data.files.length; i++) {
-                                var file = data.files[i];
-                                file.index      = i;
-                                file.torrent    = this;
-                                file.priority   = data.fileStats[i].priority;
-                                file.wanted     = data.fileStats[i].wanted;
-                                var torrentFile = new TorrentFile(file);
-                                this._files.push(torrentFile);
-                                var e = torrentFile.domElement();
-                                e.className = (i % 2 ? 'even' : 'odd') + ' inspector_torrent_file_list_entry'; 
-                                this._fileList.appendChild( e );
-                        }
+
+                for( var i=0; data.files!=null && i<data.files.length; ++i ) {
+                        var src = data.files[i];
+                        var tgt = this._file_model[i];
+                        if( !tgt )
+                                tgt = this._file_model[i] = { };
+                        tgt.index = i;
+                        tgt.torrent = this;
+                        tgt.length = src.length;
+                        tgt.name = src.name;
                 }
 
@@ -199 +194 @@
         uploadSpeed: function() { return this._upload_speed; },
         uploadTotal: function() { return this._upload_total; },
-        showFileList: function() { this.refreshFiles(); this.fileList().show(); },
+        showFileList: function() { this.ensureFileListExists(); this.refreshFileView(); this.fileList().show(); },
         hideFileList: function() { this.fileList().hide(); },
         
@@ -316 +311 @@
                 this._total_seeders         = Math.max( 0, data.seeders );
                 this._state                 = data.status;
-                
-                if (data.fileStats) {
-                        for (var i = 0; i < data.fileStats.length; i++) {
-                                var file_data      = {};
-                                file_data.priority = data.fileStats[i].priority;
-                                file_data.wanted   = data.fileStats[i].wanted;
-                                file_data.bytesCompleted = data.fileStats[i].bytesCompleted;
-                                this._files[i].readAttributes(file_data);
-                        }
-                }
-        },
-
-        refreshFileData: function(data) {
-                for (var i = 0; i < data.fileStats.length; i++) {
-                        var file_data      = {};
-                        file_data.priority = data.fileStats[i].priority;
-                        file_data.wanted   = data.fileStats[i].wanted;
-                        file_data.bytesCompleted = data.fileStats[i].bytesCompleted;
-                        this._files[i].readAttributes(file_data);
-                        this._files[i].refreshHTML();
+
+                if (data.fileStats)
+                        this.refreshFileModel( data );
+        },
+
+        refreshFileModel: function(data) {
+                for( var i=0; i<data.fileStats.length; ++i ) {
+                        var src = data.fileStats[i];
+                        var tgt = this._file_model[i];
+                        if( !tgt )
+                                tgt = this._file_model[i] = { };
+                        tgt.wanted = src.wanted;
+                        tgt.priority = src.priority;
+                        tgt.bytesCompleted = src.bytesCompleted;
                 }
         },
@@ -470 +459 @@
                 setInnerHTML( root._peer_details_container, peer_details );
         
-                this.refreshFiles( );   
-        },
-
-        refreshFiles: function() {
-                jQuery.each(this._files, function () {
-                        this.refreshHTML();
-                } );
+                this.refreshFileView( );        
+        },
+
+        refreshFileView: function() {
+                if( this._file_view.length )
+                        for( var i=0; i<this._file_model.length; ++i )
+                                this._file_view[i].update( this._file_model[i] );
+        },
+
+        ensureFileListExists: function() {
+                if( this._file_view.length == 0 ) {
+                        for( var i=0; i<this._file_model.length; ++i ) {
+                                var v = new TorrentFile( this._file_model[i] );
+                                this._file_view[i] = v;
+                                var e = v.domElement( );
+                                e.className = (i % 2 ? 'even' : 'odd') + ' inspector_torrent_file_list_entry';
+                                this._fileList.appendChild( e );
+                        }
+                }
         },
 
@@ -644 +645 @@
 TorrentFile.prototype = {
         initialize: function(file_data) {
+                //console.log( 'new TorrentFile ' + file_data.name );
                 this._dirty = true;
                 this._torrent = file_data.torrent;
@@ -680 +682 @@
                 this._priority_control.bind('click', { file: this }, this.filePriorityControlClicked);
         },
+
+        update: function(file_data) {
+                this.readAttributes(file_data);
+                this.refreshHTML();
+        },
         
         readAttributes: function(file_data) {
@@ -713 +720 @@
         
         setPriority: function(priority) {
-                if(this.element().hasClass('complete') || this._torrent._files.length == 1)
+                if(this.element().hasClass('complete') || this._torrent._file_model.length == 1)
                   return;
                 var priority_level = { high: 1, normal: 0, low: -1 }[priority];
@@ -731 +738 @@
         
         toggleWanted: function() {
-                if(this.element().hasClass('complete') || this._torrent._files.length == 1)
+                if(this.element().hasClass('complete') || this._torrent._file_model.length == 1)
                   return;
                 this.setWanted(!this._wanted);

trunk/web/javascript/transmission.js

@@ -78 +78 @@
                 this._torrent_list = $('#torrent_list')[0];
                 this._inspector_file_list = $('#inspector_file_list')[0];
+                this._inspector_tab_files = $('#inspector_tab_files')[0];
                 
                 // Setup the preference box
@@ -612 +613 @@
                 }
                 this.hideiPhoneAddressbar();
+        
+                this.updateVisibleFileLists();
         },
         
@@ -1011 +1014 @@
                 this.updateVisibleFileLists();
         },
+
+        fileListIsVisible: function() {
+                return this._inspector_tab_files.className.indexOf('selected') != -1;
+        },
         
         updateVisibleFileLists: function() {
-                jQuery.each( this.getSelectedTorrents(), function() {
-                        this.showFileList();
-                } );
-                jQuery.each( this.getDeselectedTorrents(), function() {
-                        this.hideFileList();
-                } );
+                if( this.fileListIsVisible( ) === true ) {
+                        jQuery.each( this.getSelectedTorrents(), function() { this.showFileList(); } );
+                        jQuery.each( this.getDeselectedTorrents(), function() { this.hideFileList(); } );
+                }
         },
     
@@ -1132 +1137 @@
         updateTorrentsFileData: function( torrents ){
                 var tr = this;
+                var listIsVisible = tr.fileListIsVisible( );
                 jQuery.each( torrents, function() {
                         var t = Torrent.lookup(tr._torrents, this.id);
-                        if (t)
-                    t.refreshFileData(this);
+                        if (t) {
+                                t.refreshFileModel(this);
+                                if( listIsVisible && t.isSelected())
+                                        t.refreshFileView();
+                        }
                 } );
         },