Changeset 8492

Timestamp:

May 23, 2009, 3:05:58 PM (14 years ago)

Author:

charles

Message:

(trunk web) #2052: "Warning: Unresponsive Script"

Location:

trunk/web/javascript

Files:

• torrent.js (modified) (8 diffs)
• transmission.js (modified) (1 diff)

trunk/web/javascript/torrent.js

@@ -49 +49 @@
                 
                 // Create the 'name' <div>
-                var e = $('<div/>');
-                e.addClass('torrent_name');
-                element.append( e );
+                var e = document.createElement( 'div' );
+                e.className = 'torrent_name';
+                element[0].appendChild( e );
                 element._name_container = e;
                 
                 // Create the 'progress details' <div>
-                e = $('<div/>');
-                e.addClass('torrent_progress_details');
-                element.append(e);
+                e = document.createElement( 'div' );
+                e.className = 'torrent_progress_details';
+                element[0].appendChild( e );
                 element._progress_details_container = e;
 
                 // Create the 'in progress' bar
-                e = $('<div/>');
-                e.addClass('torrent_progress_bar incomplete');
-                e.css('width', '0%');
-                element.append( e );
+                e = document.createElement( 'div' );
+                e.className = 'torrent_progress_bar incomplete';
+                e.style.width = '0%';
+                element[0].appendChild( e );
                 element._progress_complete_container = e;
                         
                 // Create the 'incomplete' bar (initially hidden)
-                e = $('<div/>');
-                e.addClass('torrent_progress_bar incomplete');
-                e.hide();
-                element.append( e );
+                e = document.createElement( 'div' );
+                e.className = 'torrent_progress_bar incomplete';
+                e.style.display = 'none';
+                element[0].appendChild( e );
                 element._progress_incomplete_container = e;
                 
@@ -77 +77 @@
                 // image or alt text until the 'refresh()' function
                 // (depends on torrent state)
-                var image = $('<div/>');
-                image.addClass('torrent_pause');
-                e = $('<a/>');
-                e.append( image );
-                element.append( e );
+                var image = document.createElement( 'div' );
+                image.className = 'torrent_pause';
+                e = document.createElement( 'a' );
+                e.appendChild( image );
+                element[0].appendChild( e );
                 element._pause_resume_button_image = image;
-                element._pause_resume_button = e;
-                if (!iPhone) e.bind('click', {element: element}, this.clickPauseResumeButton);
+                //element._pause_resume_button = e;
+                if (!iPhone) $(e).bind('click', {element: element}, this.clickPauseResumeButton);
                 
                 // Create the 'peer details' <div>
-                e = $('<div/>');
-                e.addClass('torrent_peer_details');
-                element.append( e );
+                e = document.createElement( 'div' );
+                e.className = 'torrent_peer_details';
+                element[0].appendChild( e );
                 element._peer_details_container = e;
                 
@@ -341 +341 @@
                 var MaxBarWidth = 100; // reduce this to make the progress bar shorter (%)
                 
-                setInnerHTML( root._name_container[0], this._name );
+                setInnerHTML( root._name_container, this._name );
                 
                 // Add the progress bar
@@ -380 +380 @@
                         var class_name = this.isActive() ? 'in_progress' : 'incomplete_stopped';
                         var e = root._progress_complete_container;
-                        e.removeClass( );
-                        e.addClass( 'torrent_progress_bar' );
-                        e.addClass( class_name );
-                        e.css( 'width', css_completed_width + '%' );
-                        if(css_completed_width == 0) { e.addClass( 'empty' ); }
+                        var str = 'torrent_progress_bar ' + class_name;
+                        if(css_completed_width == 0) { str += ' empty'; }
+                        e.className = str;
+                        e.style.width = css_completed_width + '%';
                         
                         // Update the 'incomplete' bar
                         e = root._progress_incomplete_container;
-                        if( !e.is('.incomplete')) {
-                                e.removeClass();
-                                e.addClass('torrent_progress_bar in_progress');
-                        }
-                        e.css('width', (MaxBarWidth - css_completed_width) + '%');
-                        e.show();
+                        if( e.className.indexOf( 'incomplete' ) == -1 )
+                                e.className = 'torrent_progress_bar in_progress';
+                        e.style.width =  (MaxBarWidth - css_completed_width) + '%';
+                        e.style.display = 'block';
                         
                         // Create the 'peer details' label
@@ -417 +414 @@
                         var class_name = (this.isActive()) ? 'complete' : 'complete_stopped';
                         var e = root._progress_complete_container;
-                        e.removeClass();
-                        e.addClass('torrent_progress_bar ' + class_name );
+                        e.className = 'torrent_progress_bar ' + class_name;
                         
                         // Create the 'progress details' label
@@ -430 +426 @@
                         
                         // Hide the 'incomplete' bar
-                        root._progress_incomplete_container.hide();
+                        root._progress_incomplete_container.style.display = 'none';
                         
                         // Set progress to maximum
-                        root._progress_complete_container.css('width', MaxBarWidth + '%');
+                        root._progress_complete_container.style.width =  MaxBarWidth + '%';
                         
                         // Create the 'peer details' label
@@ -450 +446 @@
                 
                 // Update the progress details
-                setInnerHTML( root._progress_details_container[0], progress_details );
+                setInnerHTML( root._progress_details_container, progress_details );
                 
                 // Update the peer details and pause/resume button
-                e = root._pause_resume_button_image[0];
+                e = root._pause_resume_button_image;
                 if ( this.state() == Torrent._StatusPaused ) {
                         e.alt = 'Resume';
@@ -468 +464 @@
                 }
                 
-                setInnerHTML( root._peer_details_container[0], peer_details );
+                setInnerHTML( root._peer_details_container, peer_details );
         
                 this.refreshFiles( );   

trunk/web/javascript/transmission.js

@@ -1185 +1185 @@
         {
                 var rows = this.getVisibleRows( );
-                for( var i=0, len=rows.length; i<len; ++i )
-                        if ((i+1) % 2 == 0)
-                                $.className.add( rows[i][0], 'even' );
-                        else
-                                $.className.remove( rows[i][0], 'even' );
+                for( var i=0, len=rows.length; i<len; ++i ) {
+                        var wasEven = rows[i][0].className.indexOf('even') != -1;
+                        var isEven = ((i+1) % 2 == 0);
+                        if( wasEven != isEven ) {
+                                if( wasEven )
+                                        rows[i].removeClass('even');
+                                else
+                                        rows[i].addClass('even');
+                        }
+                }
         },