Changeset 14495

Timestamp:

Jan 24, 2016, 12:00:16 AM (6 years ago)

Author:

Christian Boos

Message:

1.2dev: remove browser conditionals in JavaScript code.

The version of jQuery we're now using no longer supports the $.browser feature, and we don't need it anymore anyway.

Closes #12314.

Location:

trunk/trac/htdocs

Files:

• css/browser.css (modified) (1 diff)
• js/blame.js (modified) (8 diffs)
• js/diff.js (modified) (1 diff)
• js/folding.js (modified) (1 diff)

trunk/trac/htdocs/css/browser.css

@@ -33 +33 @@
 
 div.message {
-  background: #f7f7f0;
-  border: 3px double #d7d7d7;
+  background: #ececec;
+  border: 1px solid #cecece;
   margin: 0;
   padding: 8px;
-  /* Note: border width and padding must be compensated for in the placement */
+  box-shadow: .2em .4em .7em 1px #999;
+  border-radius: .4em;
+  /* Note that border width and padding must be compensated for in the placement */
 }
 
 div.message div.inlinebuttons { float: right;  }
+div.message div.embedded { clear: right; }
 
 /* Styles for the directory entries table

trunk/trac/htdocs/js/blame.js

@@ -5 +5 @@
     var message = null;
     var message_rev = null;
-  
+
     /* for each blame cell... */
     $("table.code th.blame").each(function() {
@@ -13 +13 @@
       if (!href)
         return; // was "Rev" column title
-      
+
       var path = original_path;
       if (href) {
@@ -25 +25 @@
           if (!path)
             path = original_path;
-        } 
+        }
       }
 
@@ -32 +32 @@
       if (!rev)
         return;
-  
+
       $(this).css("cursor", "pointer").click(function() {
         var row = this.parentNode;
@@ -38 +38 @@
         var highlight_rev = null;
         var annotate_path = decodeURI(path);
-  
+
         function show() {
           /* Display commit message for the selected revision */
-  
+
           var message_w = message.get(0).offsetWidth;
-  
+
           // limit message panel width to 3/5 of the row width
           var row_w = row.offsetWidth;
           var max_w = (3.0 * row_w / 5.0);
           if (!message_w || message_w > max_w) {
-            message_w = max_w; 
-            var borderw = (3+8)*2; // borderwidth + padding on both sides 
+            message_w = max_w;
+            var borderw = (3+8)*2; // borderwidth + padding on both sides
             message.css({width: message_w - borderw + "px"});
           }
-  
+
           var row_offset = $(row).offset();
           var left = row_offset.left + row.offsetWidth - message_w;
           message.css({display: "block", top: row_offset.top+"px", left: left-2+"px"});
         }
-  
+
         function hide() {
           /* Hide commit message */
           message.css({display: "none"});
-  
+
           /* Remove highlighting for lines of the current revision */
-          $("table.code th."+message_rev).each(function() { 
-            $(this.parentNode).removeClass("hilite") 
+          $("table.code th."+message_rev).each(function() {
+            $(this.parentNode).removeClass("hilite")
           });
         }
-  
+
         if (message_rev != rev) {              // fetch a new revision
           if (message_is_visible) {
@@ -74 +74 @@
           message_rev = rev;
           highlight_rev = message_rev;
-  
-          $.get(url + [rev.substr(1), reponame].join("/"), 
+
+          $.get(url + [rev.substr(1), reponame].join("/"),
                 {annotate: annotate_path}, function(data) {
             // remove former message panel if any
@@ -85 +85 @@
             message = $('<div class="message">').css("position", "absolute")
                 .append($('<div class="inlinebuttons">')
-                .append($('<input value="' + _("Close") + '" type="button">').click(hide)))
-                .append($('<div>').html(data))
+                  .append($('<input value="' + _("Close") + '" type="button">').click(hide)))
+                .append($('<div class="embedded">').html(data))
               .appendTo("body");
 
-            // workaround non-clickable "Close" issue in Firefox
-            if ($.browser.mozilla || $.browser.webkit)
-              message.find("div.inlinebuttons").next().css("clear", "right");
-  
             show();
           }, 'html');
@@ -101 +97 @@
           highlight_rev = message_rev;
         }
-  
+
         /* Highlight all lines of the current revision */
-        $("table.code th."+highlight_rev).each(function() { 
-          $(this.parentNode).addClass("hilite") 
+        $("table.code th."+highlight_rev).each(function() {
+          $(this.parentNode).addClass("hilite")
         });
-  
+
       });
     });

trunk/trac/htdocs/js/diff.js

@@ -95 +95 @@
       .replace("{5}", title);
 
-    /* remove trailing   and join lines (with CR for IExplorer) */
-    var sep = $.browser.msie ? "\r" : "\n";
-    for ( var i = 0; i < lines.length; i++ )
-        if ( lines[i] )
-        {
-            var line = lines[i].replace(/\xa0$/, '') + sep;
-            if ( lines[i][0] == '+' )
+    /* remove trailing &nbsp; and join lines */
+    for (var i = 0; i < lines.length; i++)
+        if (lines[i]) {
+            var line = lines[i].replace(/\xa0$/, '') + "\n";
+            if (lines[i][0] == '+')
               pre.append($('<span class="add">').text(line));
-            else if ( lines[i][0] == '-' )
+            else if (lines[i][0] == '-')
               pre.append($('<span class="rem">').text(line));
             else

trunk/trac/htdocs/js/folding.js

@@ -64 +64 @@
               $(this).remove();
               th.show();
-              if ($.browser.msie)
-                for ( var i = 0; i < n; i++ )
-                  row_headers.eq(i*k+j).show();
-              else // much faster, but not supported by IExplorer
-                for ( var i = 0; i < n; i++ )
-                  row_headers.eq(i*k+j).css('display', 'table-cell');
+              for (var i = 0; i < n; i++)
+                row_headers.eq(i*k+j).css('display', 'table-cell');
             })
           );