Changeset 8568

Timestamp:

May 31, 2009, 5:05:22 PM (14 years ago)

Author:

kjg

Message:

(trunk web) move ie specific stylesheet logic into the html to prevent a js race condition

Location:

trunk/web

Files:

• index.html (modified) (1 diff)
• javascript/common.js (modified) (2 diffs)
• javascript/transmission.js (modified) (1 diff)

trunk/web/index.html

@@ -12 +12 @@
                 <link media="only screen and (max-device-width: 480px)" href="./stylesheets/iphone.css" type= "text/css" rel="stylesheet" />
                 <link media="screen and (min-device-width: 481px)" href="./stylesheets/common.css" type="text/css" rel="stylesheet" />
+                <!--[if IE]><link media="screen" href="./stylesheets/common.css" type="text/css" rel="stylesheet" /><![endif]-->
+                <!--[if IE 6]><link media="screen" href="./stylesheets/ie6.css" type="text/css" rel="stylesheet" /><![endif]-->
+                <!--[if IE 7]><link media="screen" href="./stylesheets/ie7.css" type="text/css" rel="stylesheet" /><![endif]-->
                 <script type="text/javascript" src="./javascript/jquery/jquery.transmenu.min.js"></script>
                 <script type="text/javascript" src="./javascript/jquery/jquery.contextmenu.min.js"></script>

trunk/web/javascript/common.js

@@ -34 +34 @@
 
 $(document).ready( function() {
-        // Initialise a torrent controller to handle events
-        
         // Initialise the dialog controller
         dialog = new Dialog();
@@ -41 +39 @@
         // Initialise the main Transmission controller
         transmission = new Transmission();
+
+        // IE specific fixes here
+        if ($.browser.msie) {
+                try {
+                  document.execCommand("BackgroundImageCache", false, true);
+                } catch(err) {}
+                $('.dialog_container').css('height',$(window).height()+'px');
+        }
 
         if ($.browser.safari) {

trunk/web/javascript/transmission.js

@@ -21 +21 @@
         initialize: function()
         {
-                // IE specific fixes here
-                if ($.browser.msie) {
-                        try {
-                          document.execCommand("BackgroundImageCache", false, true);
-                        } catch(err) {}
-                        $('head').append('<link media="screen" href="./stylesheets/common.css" type="text/css" rel="stylesheet" />');
-                        $('head').append('<link media="screen" href="./stylesheets/ie'+$.browser.version.substr(0,1)+'.css" type="text/css" rel="stylesheet" />');
-                        $('.dialog_container').css('height',$(window).height()+'px');
-                }
-                
                 // Initialize the helper classes
                 this.remote = new TransmissionRemote(this);