Changeset 2250

Timestamp:

07/25/08 02:29:25 (6 months ago)

Author:

ringmaster

Message:

Merging r2240, r2243, and r2244 from trunk to makaanga to address IE issues.

Location:

makaanga/0.x/htdocs/system

Files:

• admin/css/admin.css (modified) (2 diffs)
• admin/css/ie.css (copied) (copied from trunk/htdocs/system/admin/css/ie.css)
• admin/header.php (modified) (1 diff)
• admin/js/admin.js (modified) (11 diffs)
• classes/plugins.php (modified) (1 diff)

makaanga/0.x/htdocs/system/admin/css/admin.css

@@ -1415 +1415 @@
     display: table-row;
     height: inherit;
-    overflow: hidden;
+    /*overflow: hidden;*/
     position: relative;
     border: none !important;
@@ -1483 +1483 @@
     line-height: 20px;
     padding: 2px 0;
+}
+
+.tag span {
     white-space: nowrap;
 }

makaanga/0.x/htdocs/system/admin/header.php

@@ -36 +36 @@
         Stack::out( 'admin_header_javascript', '<script src="%s" type="text/javascript"></script>'."\r\n" );
     ?>
+    <!--[if IE 7]>
+    <link rel="stylesheet" type="text/css" href="<?php Site::out_url('admin_theme'); ?>/css/ie.css" media="screen">
+    <![endif]-->
 
 </head>

makaanga/0.x/htdocs/system/admin/js/admin.js

@@ -534 +534 @@
         if (!$('.timeline').length) return;
 
-        var timelineWidth = $('.years').width();
-        var viewWidth= $('.timeline').width();
-        timeline.overhang= ( timelineWidth > viewWidth ) ? timelineWidth - viewWidth : 0;
-
         // Set up pointers to elements for speed
         timeline.view= $('.timeline');
@@ -551 +547 @@
             timeline.totalCount += timeline.monthData[i];
         });
+
+        // manually set the timelineWidth to contain its children for IE7
+        var timelineWidth = 0;
+        if ( $.browser.msie ) {
+            jQuery(timeline.monthWidths).each(function() { timelineWidth += this; } );
+            $('.years').width( timelineWidth );
+        }
+        else {
+            timelineWidth = $('.years').width();
+        }
+
+        // check for a timeline larger than its view
+        timeline.overhang= ( timelineWidth > viewWidth ) ? timelineWidth - viewWidth : 0;
+        var viewWidth= $('.timeline').width();
+        timeline.overhang= ( timelineWidth > viewWidth ) ? timelineWidth - viewWidth : 0;
 
         // Find the width which makes the loupe select 20 items
@@ -582 +593 @@
             slide: function( event, ui) {
                 timeline.updateView();
-            },
+            }
         })
         .unbind('click')
@@ -699 +710 @@
     },
     reset: function () {
-        var timelineWidth = $('.years').width();
-        var viewWidth= $('.timeline').width();
-        timeline.overhang= ( timelineWidth > viewWidth ) ? timelineWidth - viewWidth : 0;
-
         // update the arrays of posts per month
         timeline.monthData= [0];
@@ -713 +720 @@
         });
 
+        // manually set the timelineWidth to contain its children for IE7
+        var timelineWidth = 0;
+        if ( $.browser.msie ) {
+            jQuery(timeline.monthWidths).each(function() { timelineWidth += this; } );
+            $('.years').width( timelineWidth );
+        }
+        else {
+            timelineWidth = $('.years').width();
+        }
+
+        // check for a timeline larger than its view
+        timeline.overhang= ( timelineWidth > viewWidth ) ? timelineWidth - viewWidth : 0;
+        var viewWidth= $('.timeline').width();
+        timeline.overhang= ( timelineWidth > viewWidth ) ? timelineWidth - viewWidth : 0
+
         // find the width which makes the loupe select 20 items
         var handleWidth= timelineWidth - timeline.positionFromIndex( timeline.totalCount - 20 );
@@ -736 +758 @@
 var timelineHandle = {
     init: function( handleWidth ) {
-        $('.handle').css('width', handleWidth + 'px');
+        timeline.handle.css('width', handleWidth + 'px');
+
+        /* force 'right' property to 'auto' so we can check in doDragLeft if we have fixed the 
+         * right side of the handle */
+        timeline.handle.css('right', 'auto');
         // Resize Handle Left
         $('.resizehandleleft')
             .mousedown(function(e) {
-                timelineHandle.firstMousePos = $('.handle').offset().left - $('.track').offset().left;
-                timelineHandle.initialSize = $('.handle').width();
+                timelineHandle.firstMousePos = timeline.handle.offset().left - $('.track').offset().left;
+                timelineHandle.initialSize = timeline.handle.width();
 
                 $(document).mousemove(timelineHandle.doDragLeft).mouseup(timelineHandle.endDrag);
@@ -751 +777 @@
             .mousedown(function(e) {
                 timelineHandle.firstMousePos = e.clientX;
-                timelineHandle.initialSize = $('.handle').width();
+                timelineHandle.initialSize = timeline.handle.width();
 
                 $(document).mousemove(timelineHandle.doDragRight).mouseup(timelineHandle.endDrag);
@@ -759 +785 @@
     },
     doDragLeft: function(e) {
-        $('.handle').css({
-            'left':     'auto',
-            'right':    $('.handle').parents('.track').width() - (parseInt($('.handle').css('left')) + $('.handle').width())
-        });
+        var h = timeline.handle;
+        var track = h.parents('.track');
+        // fix the right side (only do this if we haven't already done it)
+        if ( h.css('right') == 'auto' ) {
+            h.css({
+                'left': 'auto',
+                'right': track.width() - ( parseInt(h.css('left')) + h.width() )
+            });
+        }
 
         // Set Loupe Width. Min 20, Max 200, no spilling to the left
-        $('.handle').css('width', Math.min(Math.max(timelineHandle.initialSize + (timelineHandle.firstMousePos - (e.clientX - $('.track').offset().left)), 20), Math.min($('.track').width() - parseInt($('.handle').css('right')), 200)));
+        h.css('width', Math.min(Math.max(timelineHandle.initialSize + (timelineHandle.firstMousePos - (e.clientX - track.offset().left)), 20), Math.min(track.width() - parseInt(h.css('right')), 200)));
 
         return false;
     },
     doDragRight: function(e) {
-        $('.handle').css({
-            'left':     $('.handle').offset().left - $('.track').offset().left,
-            'right':    'auto'
+        var h = timeline.handle;
+        var track = h.parents('.track');
+        // fix the left side
+        h.css({
+            'left': h.offset().left - track.offset().left,
+            'right': 'auto'
         });
 
         // Set Loupe Width. Min 20, Max 200, no spilling to the right
-        $('.handle').css( 'width', Math.min(Math.max(timelineHandle.initialSize + (e.clientX - timelineHandle.firstMousePos), 20), Math.min($('.track').width() - parseInt($('.handle').css('left')), 200)) );
+        h.css( 'width', Math.min(Math.max(timelineHandle.initialSize + (e.clientX - timelineHandle.firstMousePos), 20), Math.min(track.width() - parseInt(h.css('left')), 200)) );
 
         return false;
@@ -790 +824 @@
             end: loupeEndPosition,
             offset: parseInt(timeline.totalCount) - parseInt(loupeEndPosition),
-            limit: 1 + parseInt(loupeEndPosition) - parseInt(loupeStartPosition),
-            };
+            limit: 1 + parseInt(loupeEndPosition) - parseInt(loupeStartPosition)
+        };
         return loupeInfo;
     },
@@ -815 +849 @@
 
         return false;
-    },
+    }
 }
 
@@ -1050 +1084 @@
         liveSearch.prevSearch = liveSearch.input.val();
         itemManage.fetch( 0, 20, true );
-    },
+    }
 }
 

makaanga/0.x/htdocs/system/classes/plugins.php

@@ -270 +270 @@
     public static function class_from_filename( $file )
     {
-        if ( ! self::$plugin_classes ) {
+        if ( true || ! self::$plugin_classes ) {
             self::get_plugin_classes();
         }