Changeset 17417

Timestamp:

2008/07/10 18:57:26 (15 years ago)

Author:

pineray

Message:

レイアウト編集のjavascriptをjquery UIを用いて全面的に書き直し

Location:

branches/comu-ver2

Files:

• data/Smarty/templates/default/admin/design/index.tpl (modified) (6 diffs)
• html/user_data/packages/default/css/admin_contents.css (modified) (1 diff)
• html/user_data/packages/default/js/interface.js (deleted)
• html/user_data/packages/default/js/jquery.js (modified) (106 diffs)
• html/user_data/packages/default/js/layout_design.js (modified) (2 diffs)
• html/user_data/packages/default/js/ui.core.js (added)
• html/user_data/packages/default/js/ui.sortable.js (added)

branches/comu-ver2/data/Smarty/templates/default/admin/design/index.tpl

@@ -10 +10 @@
 }
 
-// 初期処理
-function init () {
-    document.body.ondrag = function () { return false; };
-    document.body.onselectstart = function () { return false; };
-
-    // ウィンドウサイズを取得
-  scrX = GetWindowSize("width");
-  scrY = GetWindowSize("height");
-
-  // ウィンドウサイズ変更イベントに関連付け
-    window.onresize = fnMoveObject;
-
-  // divタグを取得
-  all_elms = document.getElementsByTagName ( 'div' );
-
-  all_dragged = $(".dragged-elm");
-  all_target = $(".drop-target");
-
-  // 配列作成
-  fnCreateArr(0);
-
-  // alerttest(0);
-
-    // 並び替え
-  fnMoveObject();
-
-  <!--{$complate_msg}-->
-}
-
 </script>
 
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/ui.core.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/ui.sortable.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/layout_design.js"></script>
 
@@ -68 +41 @@
             <!--{* 左ナビテーブルここから *}-->
             <td rowspan="3" id="layout-left">
-              <div tid="LeftNavi" class="drop-target" id="t1" style="width: 145px; height: 100px;"></div>
+              <div id="LeftNavi" class="ui-sortable" style="position: relative; width: 145px; height: 100px;">
+                <!--{assign var="firstflg" value=false}-->
+                <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                <!--{if $item.target_id == "LeftNavi"}-->
+                <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                  <!--{$item.name}-->
+                  <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                  <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                  <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                  <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                </div>
+                <!--{assign var="firstflg" value=true}-->
+                <!--{/if}-->
+                <!--{/foreach}-->
+              </div>
             </td>
             <!--{* 左ナビテーブルここまで *}-->
             <!--{* メイン上部テーブルここから *}-->
             <td id="layout-main-head">
-              <div tid="MainHead" class="drop-target" id="t2" style="width: 145px; height: 100px;"></div>
+              <div id="MainHead" class="ui-sortable" style="position: relative; width: 145px; height: 100px;">
+                <!--{assign var="firstflg" value=false}-->
+                <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                <!--{if $item.target_id == "MainHead"}-->
+                <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                  <!--{$item.name}-->
+                  <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                  <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                  <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                  <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                </div>
+                <!--{assign var="firstflg" value=true}-->
+                <!--{/if}-->
+                <!--{/foreach}-->
+              </div>
             </td>
             <!--{* メイン上部テーブルここまで *}-->
             <!--{* 右ナビここから *}-->
             <td rowspan="3" id="layout-right">
-              <div tid="RightNavi" class="drop-target" id="t3" style="width: 145px; height: 100px;"></div>
+              <div id="RightNavi" class="ui-sortable" style="position: relative; width: 145px; height: 100px;">
+                <!--{assign var="firstflg" value=false}-->
+                <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                <!--{if $item.target_id == "RightNavi"}-->
+                <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                  <!--{$item.name}-->
+                  <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                  <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                  <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                  <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                </div>
+                <!--{assign var="firstflg" value=true}-->
+                <!--{/if}-->
+                <!--{/foreach}-->
+              </div>
             </td>
             <!--{* 右ナビここまで *}-->
@@ -90 +105 @@
           <tr>
             <td id="layout-main-foot">
-              <div tid="MainFoot" class="drop-target" id="t4" style="width: 145px; height: 100px;"></div>
+              <div id="MainFoot" class="ui-sortable" style="position: relative; width: 145px; height: 100px;">
+                <!--{assign var="firstflg" value=false}-->
+                <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                <!--{if $item.target_id == "MainFoot"}-->
+                <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                  <!--{$item.name}-->
+                  <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                  <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                  <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                  <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                </div>
+                <!--{assign var="firstflg" value=true}-->
+                <!--{/if}-->
+                <!--{/foreach}-->
+              </div>
             </td>
           </tr>
@@ -103 +132 @@
       <!--{* ▼未使用ブロックここから *}-->
       <td>
-        <div tid="Unused" class="drop-target" id="t5" style="width: 160px; height: 500px;"></div>
+        <div id="Unused" class="ui-sortable" style="position: relative; width: 145px; height: 500px;">
+          <!--{assign var="firstflg" value=false}-->
+          <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+          <!--{if $item.target_id == "Unused"}-->
+          <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+            <!--{$item.name}-->
+            <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+            <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+            <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+            <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+          </div>
+          <!--{assign var="firstflg" value=true}-->
+          <!--{/if}-->
+          <!--{/foreach}-->
+        </div>
         <div class="btn"><button type='button' onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_bloc','','');"><span>新規ブロック作成</span></button></div>
       </td>
@@ -119 +162 @@
   <!--▼ページ一覧　ここから-->
   <h2>編集可能ページ</h2>
-
   <table class="list center">
   <!--{foreach key=key item=item from=$arrEditPage}-->
@@ -141 +183 @@
   </div>
   <!--▲ページ一覧　ここまで-->
-
-
-
-<!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-<div target_id="<!--{$item.target_id}-->" did="<!--{$smarty.foreach.bloc_loop.iteration}-->" class="dragged-elm" style="left:350px; top:0px; filter: alpha(opacity=100); opacity: 1;width: 120px;">
-   <!--{$item.name}-->
-</div>
-<input type="hidden" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
-<input type="hidden" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
-<input type="hidden" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
-<input type="hidden" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
-<!--{/foreach}-->
 </div>
 </form>

branches/comu-ver2/html/user_data/packages/default/css/admin_contents.css

@@ -368 +368 @@
 ----------------------------------------------- */
 /* レイアウト管理 */
-div.dragged-elm {
-    position:   absolute;
+div.sort {
     border:     1px solid black;
     background: rgb(195,217,255);
     color:      #333;
-    cursor:     move;
     padding:    5px 2px;
+    margin:     5px 0px;
     font-size:  10pt;
     text-align: center;
-}
-div.drop-target {
-    border:      0px solid gray;
-    position:    relative;
-    text-align:  center;
-    color:       #333;
-}
+    width:      140px;
+}
+.placeholder { border:1px dashed #AAA; }
+
 #design-layout-body {
     width: 450px;
     margin: 0 auto;
 }
-#design-layout-wrap-unused {width:164px;}
-#layout-left, #layout-right {
-    width: 150px;
+#design-layout-body td {
+    width: 145px;
+    vertical-align: top;
+    text-align: center;
+}
+#design-layout-wrap-unused {width:145px;}
+#LeftNavi, #RightNavi {
+    width: 140px;
+    min-height: 400px;
+    height: auto !important;
     height: 400px;
     vertical-align: top;
 }
-#layout-main-head, #layout-main-foot { vertical-align: top; }
-#layout-header, #layout-footer, #layout-main { text-align: center; }
+#design-layout-body #MainHead, #design-layout-body #MainFoot {
+    min-height: 100px;
+    height: auto !important;
+    height: 100px;
+}
+#design-layout-body td#layout-main {vertical-align: middle;}
 
 

branches/comu-ver2/html/user_data/packages/default/js/jquery.js

@@ -1 +1 @@
 (function(){
 /*
- * jQuery 1.2 - New Wave Javascript
+ * jQuery 1.2.6 - New Wave Javascript
  *
- * Copyright (c) 2007 John Resig (jquery.com)
+ * Copyright (c) 2008 John Resig (jquery.com)
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * and GPL (GPL-LICENSE.txt) licenses.
  *
- * $Date: 2007-09-10 15:45:49 -0400 (Mon, 10 Sep 2007) $
- * $Rev: 3219 $
+ * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
+ * $Rev: 5685 $
  */
 
 // Map over jQuery in case of overwrite
-if ( typeof jQuery != "undefined" )
-    var _jQuery = jQuery;
-
-var jQuery = window.jQuery = function(a,c) {
-    // If the context is global, return a new object
-    if ( window == this || !this.init )
-        return new jQuery(a,c);
-    
-    return this.init(a,c);
+var _jQuery = window.jQuery,
+// Map over the $ in case of overwrite
+    _$ = window.$;
+
+var jQuery = window.jQuery = window.$ = function( selector, context ) {
+    // The jQuery object is actually just the init constructor 'enhanced'
+    return new jQuery.fn.init( selector, context );
 };
 
-// Map over the $ in case of overwrite
-if ( typeof $ != "undefined" )
-    var _$ = $;
-    
-// Map the jQuery namespace to the '$' one
-window.$ = jQuery;
-
-var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
+// A simple way to check for HTML strings or ID strings
+// (both of which we optimize for)
+var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,
+
+// Is it a simple selector
+    isSimple = /^.[^:#\[\.]*$/,
+
+// Will speed up references to undefined, and allows munging its name.
+    undefined;
 
 jQuery.fn = jQuery.prototype = {
-    init: function(a,c) {
+    init: function( selector, context ) {
         // Make sure that a selection was provided
-        a = a || document;
-
+        selector = selector || document;
+
+        // Handle $(DOMElement)
+        if ( selector.nodeType ) {
+            this[0] = selector;
+            this.length = 1;
+            return this;
+        }
         // Handle HTML strings
-        if ( typeof a  == "string" ) {
-            var m = quickExpr.exec(a);
-            if ( m && (m[1] || !c) ) {
+        if ( typeof selector == "string" ) {
+            // Are we dealing with HTML string or an ID?
+            var match = quickExpr.exec( selector );
+
+            // Verify a match, and that no context was specified for #id
+            if ( match && (match[1] || !context) ) {
+
                 // HANDLE: $(html) -> $(array)
-                if ( m[1] )
-                    a = jQuery.clean( [ m[1] ], c );
+                if ( match[1] )
+                    selector = jQuery.clean( [ match[1] ], context );
 
                 // HANDLE: $("#id")
                 else {
-                    var tmp = document.getElementById( m[3] );
-                    if ( tmp )
+                    var elem = document.getElementById( match[3] );
+
+                    // Make sure an element was located
+                    if ( elem ){
                         // Handle the case where IE and Opera return items
                         // by name instead of ID
-                        if ( tmp.id != m[3] )
-                            return jQuery().find( a );
-                        else {
-                            this[0] = tmp;
-                            this.length = 1;
-                            return this;
-                        }
-                    else
-                        a = [];
+                        if ( elem.id != match[3] )
+                            return jQuery().find( selector );
+
+                        // Otherwise, we inject the element directly into the jQuery object
+                        return jQuery( elem );
+                    }
+                    selector = [];
                 }
 
-            // HANDLE: $(expr)
+            // HANDLE: $(expr, [context])
+            // (which is just equivalent to: $(content).find(expr)
             } else
-                return new jQuery( c ).find( a );
+                return jQuery( context ).find( selector );
 
         // HANDLE: $(function)
         // Shortcut for document ready
-        } else if ( jQuery.isFunction(a) )
-            return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
-
-        return this.setArray(
-            // HANDLE: $(array)
-            a.constructor == Array && a ||
-
-            // HANDLE: $(arraylike)
-            // Watch for when an array-like object is passed as the selector
-            (a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
-
-            // HANDLE: $(*)
-            [ a ] );
-    },
-    
-    jquery: "1.2",
-
+        } else if ( jQuery.isFunction( selector ) )
+            return jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector );
+
+        return this.setArray(jQuery.makeArray(selector));
+    },
+
+    // The current version of jQuery being used
+    jquery: "1.2.6",
+
+    // The number of elements contained in the matched element set
     size: function() {
         return this.length;
     },
-    
+
+    // The number of elements contained in the matched element set
     length: 0,
 
+    // Get the Nth element in the matched element set OR
+    // Get the whole matched element set as a clean array
     get: function( num ) {
         return num == undefined ?
@@ -98 +104 @@
 
             // Return just the object
-            this[num];
-    },
-    
-    pushStack: function( a ) {
-        var ret = jQuery(a);
+            this[ num ];
+    },
+
+    // Take an array of elements and push it onto the stack
+    // (returning the new matched element set)
+    pushStack: function( elems ) {
+        // Build a new jQuery matched element set
+        var ret = jQuery( elems );
+
+        // Add the old object onto the stack (as a reference)
         ret.prevObject = this;
+
+        // Return the newly-formed element set
         return ret;
     },
-    
-    setArray: function( a ) {
+
+    // Force the current matched set of elements to become
+    // the specified array of elements (destroying the stack in the process)
+    // You should use pushStack() in order to do this, but maintain the stack
+    setArray: function( elems ) {
+        // Resetting the length to 0, then using the native Array push
+        // is a super-fast way to populate an object with array-like properties
         this.length = 0;
-        Array.prototype.push.apply( this, a );
+        Array.prototype.push.apply( this, elems );
+
         return this;
     },
 
-    each: function( fn, args ) {
-        return jQuery.each( this, fn, args );
-    },
-
-    index: function( obj ) {
-        var pos = -1;
-        this.each(function(i){
-            if ( this == obj ) pos = i;
-        });
-        return pos;
-    },
-
-    attr: function( key, value, type ) {
-        var obj = key;
-        
+    // Execute a callback for every element in the matched set.
+    // (You can seed the arguments with an array of args, but this is
+    // only used internally.)
+    each: function( callback, args ) {
+        return jQuery.each( this, callback, args );
+    },
+
+    // Determine the position of an element within
+    // the matched set of elements
+    index: function( elem ) {
+        var ret = -1;
+
+        // Locate the position of the desired element
+        return jQuery.inArray(
+            // If it receives a jQuery object, the first element is used
+            elem && elem.jquery ? elem[0] : elem
+        , this );
+    },
+
+    attr: function( name, value, type ) {
+        var options = name;
+
         // Look for the case where we're accessing a style value
-        if ( key.constructor == String )
-            if ( value == undefined )
-                return this.length && jQuery[ type || "attr" ]( this[0], key ) || undefined;
+        if ( name.constructor == String )
+            if ( value === undefined )
+                return this[0] && jQuery[ type || "attr" ]( this[0], name );
+
             else {
-                obj = {};
-                obj[ key ] = value;
-            }
-        
+                options = {};
+                options[ name ] = value;
+            }
+
         // Check to see if we're setting style values
-        return this.each(function(index){
+        return this.each(function(i){
             // Set all the styles
-            for ( var prop in obj )
+            for ( name in options )
                 jQuery.attr(
-                    type ? this.style : this,
-                    prop, jQuery.prop(this, obj[prop], type, index, prop)
+                    type ?
+                        this.style :
+                        this,
+                    name, jQuery.prop( this, options[ name ], type, i, name )
                 );
         });
@@ -149 +178 @@
 
     css: function( key, value ) {
+        // ignore negative width and height values
+        if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
+            value = undefined;
         return this.attr( key, value, "curCSS" );
     },
 
-    text: function(e) {
-        if ( typeof e != "object" && e != null )
-            return this.empty().append( document.createTextNode( e ) );
-
-        var t = "";
-        jQuery.each( e || this, function(){
+    text: function( text ) {
+        if ( typeof text != "object" && text != null )
+            return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+
+        var ret = "";
+
+        jQuery.each( text || this, function(){
             jQuery.each( this.childNodes, function(){
                 if ( this.nodeType != 8 )
-                    t += this.nodeType != 1 ?
-                        this.nodeValue : jQuery.fn.text([ this ]);
+                    ret += this.nodeType != 1 ?
+                        this.nodeValue :
+                        jQuery.fn.text( [ this ] );
             });
         });
-        return t;
-    },
-
-    wrapAll: function(html) {
+
+        return ret;
+    },
+
+    wrapAll: function( html ) {
         if ( this[0] )
             // The elements to wrap the target around
-            jQuery(html, this[0].ownerDocument)
+            jQuery( html, this[0].ownerDocument )
                 .clone()
-                .insertBefore(this[0])
+                .insertBefore( this[0] )
                 .map(function(){
                     var elem = this;
+
                     while ( elem.firstChild )
                         elem = elem.firstChild;
+
                     return elem;
                 })
@@ -184 +221 @@
     },
 
-    wrapInner: function(html) {
+    wrapInner: function( html ) {
         return this.each(function(){
-            jQuery(this).contents().wrapAll(html);
+            jQuery( this ).contents().wrapAll( html );
         });
     },
 
-    wrap: function(html) {
+    wrap: function( html ) {
         return this.each(function(){
-            jQuery(this).wrapAll(html);
+            jQuery( this ).wrapAll( html );
         });
     },
 
     append: function() {
-        return this.domManip(arguments, true, 1, function(a){
-            this.appendChild( a );
+        return this.domManip(arguments, true, false, function(elem){
+            if (this.nodeType == 1)
+                this.appendChild( elem );
         });
     },
 
     prepend: function() {
-        return this.domManip(arguments, true, -1, function(a){
-            this.insertBefore( a, this.firstChild );
+        return this.domManip(arguments, true, true, function(elem){
+            if (this.nodeType == 1)
+                this.insertBefore( elem, this.firstChild );
         });
     },
-    
+
     before: function() {
-        return this.domManip(arguments, false, 1, function(a){
-            this.parentNode.insertBefore( a, this );
+        return this.domManip(arguments, false, false, function(elem){
+            this.parentNode.insertBefore( elem, this );
         });
     },
 
     after: function() {
-        return this.domManip(arguments, false, -1, function(a){
-            this.parentNode.insertBefore( a, this.nextSibling );
+        return this.domManip(arguments, false, true, function(elem){
+            this.parentNode.insertBefore( elem, this.nextSibling );
         });
     },
 
     end: function() {
-        return this.prevObject || jQuery([]);
-    },
-
-    find: function(t) {
-        var data = jQuery.map(this, function(a){ return jQuery.find(t,a); });
-        return this.pushStack( /[^+>] [^+>]/.test( t ) || t.indexOf("..") > -1 ?
-            jQuery.unique( data ) : data );
-    },
-
-    clone: function(events) {
+        return this.prevObject || jQuery( [] );
+    },
+
+    find: function( selector ) {
+        var elems = jQuery.map(this, function(elem){
+            return jQuery.find( selector, elem );
+        });
+
+        return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ?
+            jQuery.unique( elems ) :
+            elems );
+    },
+
+    clone: function( events ) {
         // Do the clone
         var ret = this.map(function(){
-            return this.outerHTML ? jQuery(this.outerHTML)[0] : this.cloneNode(true);
+            if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) {
+                // IE copies events bound via attachEvent when
+                // using cloneNode. Calling detachEvent on the
+                // clone will also remove the events from the orignal
+                // In order to get around this, we use innerHTML.
+                // Unfortunately, this means some modifications to
+                // attributes in IE that are actually only stored
+                // as properties will not be copied (such as the
+                // the name attribute on an input).
+                var clone = this.cloneNode(true),
+                    container = document.createElement("div");
+                container.appendChild(clone);
+                return jQuery.clean([container.innerHTML])[0];
+            } else
+                return this.cloneNode(true);
         });
-        
-        if (events === true) {
-            var clone = ret.find("*").andSelf();
-
-            this.find("*").andSelf().each(function(i) {
-                var events = jQuery.data(this, "events");
+
+        // Need to set the expando to null on the cloned set if it exists
+        // removeData doesn't work here, IE removes it from the original as well
+        // this is primarily for IE but the data expando shouldn't be copied over in any browser
+        var clone = ret.find("*").andSelf().each(function(){
+            if ( this[ expando ] != undefined )
+                this[ expando ] = null;
+        });
+
+        // Copy the events from the original to the clone
+        if ( events === true )
+            this.find("*").andSelf().each(function(i){
+                if (this.nodeType == 3)
+                    return;
+                var events = jQuery.data( this, "events" );
+
                 for ( var type in events )
-                    for ( var handler in events[type] )
-                        jQuery.event.add(clone[i], type, events[type][handler], events[type][handler].data);
+                    for ( var handler in events[ type ] )
+                        jQuery.event.add( clone[ i ], type, events[ type ][ handler ], events[ type ][ handler ].data );
             });
-        }
 
         // Return the cloned set
@@ -251 +317 @@
     },
 
-    filter: function(t) {
+    filter: function( selector ) {
         return this.pushStack(
-            jQuery.isFunction( t ) &&
-            jQuery.grep(this, function(el, index){
-                return t.apply(el, [index]);
+            jQuery.isFunction( selector ) &&
+            jQuery.grep(this, function(elem, i){
+                return selector.call( elem, i );
             }) ||
 
-            jQuery.multiFilter(t,this) );
-    },
-
-    not: function(t) {
-        return this.pushStack(
-            t.constructor == String &&
-            jQuery.multiFilter(t, this, true) ||
-
-            jQuery.grep(this, function(a) {
-                return ( t.constructor == Array || t.jquery )
-                    ? jQuery.inArray( a, t ) < 0
-                    : a != t;
-            })
-        );
-    },
-
-    add: function(t) {
-        return this.pushStack( jQuery.merge(
+            jQuery.multiFilter( selector, this ) );
+    },
+
+    not: function( selector ) {
+        if ( selector.constructor == String )
+            // test special case where just one selector is passed in
+            if ( isSimple.test( selector ) )
+                return this.pushStack( jQuery.multiFilter( selector, this, true ) );
+            else
+                selector = jQuery.multiFilter( selector, this );
+
+        var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType;
+        return this.filter(function() {
+            return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector;
+        });
+    },
+
+    add: function( selector ) {
+        return this.pushStack( jQuery.unique( jQuery.merge(
             this.get(),
-            t.constructor == String ?
-                jQuery(t).get() :
-                t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
-                    t : [t] )
-        );
-    },
-
-    is: function(expr) {
-        return expr ? jQuery.multiFilter(expr,this).length > 0 : false;
-    },
-
-    hasClass: function(expr) {
-        return this.is("." + expr);
-    },
-    
-    val: function( val ) {
-        if ( val == undefined ) {
+            typeof selector == 'string' ?
+                jQuery( selector ) :
+                jQuery.makeArray( selector )
+        )));
+    },
+
+    is: function( selector ) {
+        return !!selector && jQuery.multiFilter( selector, this ).length > 0;
+    },
+
+    hasClass: function( selector ) {
+        return this.is( "." + selector );
+    },
+
+    val: function( value ) {
+        if ( value == undefined ) {
+
             if ( this.length ) {
                 var elem = this[0];
-                
+
                 // We need to handle select boxes special
-                if ( jQuery.nodeName(elem, "select") ) {
+                if ( jQuery.nodeName( elem, "select" ) ) {
                     var index = elem.selectedIndex,
-                        a = [],
+                        values = [],
                         options = elem.options,
                         one = elem.type == "select-one";
-                    
+
                     // Nothing was selected
                     if ( index < 0 )
@@ -310 +377 @@
                     // Loop through all the selected options
                     for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-                        var option = options[i];
+                        var option = options[ i ];
+
                         if ( option.selected ) {
                             // Get the specifc value for the option
-                            var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value;
-                            
+                            value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value;
+
                             // We don't need an array for one selects
                             if ( one )
-                                return val;
-                            
+                                return value;
+
                             // Multi-Selects return an array
-                            a.push(val);
+                            values.push( value );
                         }
                     }
-                    
-                    return a;
-                    
+
+                    return values;
+
                 // Everything else, we just grab the value
                 } else
-                    return this[0].value.replace(/\r/g, "");
-            }
-        } else
-            return this.each(function(){
-                if ( val.constructor == Array && /radio|checkbox/.test(this.type) )
-                    this.checked = (jQuery.inArray(this.value, val) >= 0 ||
-                        jQuery.inArray(this.name, val) >= 0);
-                else if ( jQuery.nodeName(this, "select") ) {
-                    var tmp = val.constructor == Array ? val : [val];
-
-                    jQuery("option", this).each(function(){
-                        this.selected = (jQuery.inArray(this.value, tmp) >= 0 ||
-                        jQuery.inArray(this.text, tmp) >= 0);
-                    });
-
-                    if ( !tmp.length )
-                        this.selectedIndex = -1;
-                } else
-                    this.value = val;
-            });
-    },
-    
-    html: function( val ) {
-        return val == undefined ?
-            ( this.length ? this[0].innerHTML : null ) :
-            this.empty().append( val );
-    },
-
-    replaceWith: function( val ) {
-        return this.after( val ).remove();
+                    return (this[0].value || "").replace(/\r/g, "");
+
+            }
+
+            return undefined;
+        }
+
+        if( value.constructor == Number )
+            value += '';
+
+        return this.each(function(){
+            if ( this.nodeType != 1 )
+                return;
+
+            if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
+                this.checked = (jQuery.inArray(this.value, value) >= 0 ||
+                    jQuery.inArray(this.name, value) >= 0);
+
+            else if ( jQuery.nodeName( this, "select" ) ) {
+                var values = jQuery.makeArray(value);
+
+                jQuery( "option", this ).each(function(){
+                    this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
+                        jQuery.inArray( this.text, values ) >= 0);
+                });
+
+                if ( !values.length )
+                    this.selectedIndex = -1;
+
+            } else
+                this.value = value;
+        });
+    },
+
+    html: function( value ) {
+        return value == undefined ?
+            (this[0] ?
+                this[0].innerHTML :
+                null) :
+            this.empty().append( value );
+    },
+
+    replaceWith: function( value ) {
+        return this.after( value ).remove();
+    },
+
+    eq: function( i ) {
+        return this.slice( i, i + 1 );
     },
 
@@ -364 +450 @@
     },
 
-    map: function(fn) {
-        return this.pushStack(jQuery.map( this, function(elem,i){
-            return fn.call( elem, i, elem );
+    map: function( callback ) {
+        return this.pushStack( jQuery.map(this, function(elem, i){
+            return callback.call( elem, i, elem );
         }));
     },
@@ -373 +459 @@
         return this.add( this.prevObject );
     },
-    
-    domManip: function(args, table, dir, fn) {
-        var clone = this.length > 1, a; 
-
+
+    data: function( key, value ){
+        var parts = key.split(".");
+        parts[1] = parts[1] ? "." + parts[1] : "";
+
+        if ( value === undefined ) {
+            var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+            if ( data === undefined && this.length )
+                data = jQuery.data( this[0], key );
+
+            return data === undefined && parts[1] ?
+                this.data( parts[0] ) :
+                data;
+        } else
+            return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
+                jQuery.data( this, key, value );
+            });
+    },
+
+    removeData: function( key ){
         return this.each(function(){
-            if ( !a ) {
-                a = jQuery.clean(args, this.ownerDocument);
-                if ( dir < 0 )
-                    a.reverse();
+            jQuery.removeData( this, key );
+        });
+    },
+
+    domManip: function( args, table, reverse, callback ) {
+        var clone = this.length > 1, elems;
+
+        return this.each(function(){
+            if ( !elems ) {
+                elems = jQuery.clean( args, this.ownerDocument );
+
+                if ( reverse )
+                    elems.reverse();
             }
 
             var obj = this;
 
-            if ( table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr") )
-                obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
-
-            jQuery.each( a, function(){
-                if ( jQuery.nodeName(this, "script") ) {
-                    if ( this.src )
-                        jQuery.ajax({ url: this.src, async: false, dataType: "script" });
-                    else
-                        jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
-                } else
-                    fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+            if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) )
+                obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") );
+
+            var scripts = jQuery( [] );
+
+            jQuery.each(elems, function(){
+                var elem = clone ?
+                    jQuery( this ).clone( true )[0] :
+                    this;
+
+                // execute all scripts after the elements have been injected
+                if ( jQuery.nodeName( elem, "script" ) )
+                    scripts = scripts.add( elem );
+                else {
+                    // Remove any inner scripts for later evaluation
+                    if ( elem.nodeType == 1 )
+                        scripts = scripts.add( jQuery( "script", elem ).remove() );
+
+                    // Inject the elements into the document
+                    callback.call( obj, elem );
+                }
             });
+
+            scripts.each( evalScript );
         });
     }
 };
 
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+function evalScript( i, elem ) {
+    if ( elem.src )
+        jQuery.ajax({
+            url: elem.src,
+            async: false,
+            dataType: "script"
+        });
+
+    else
+        jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+
+    if ( elem.parentNode )
+        elem.parentNode.removeChild( elem );
+}
+
+function now(){
+    return +new Date;
+}
+
 jQuery.extend = jQuery.fn.extend = function() {
     // copy reference to target object
-    var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
+    var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
 
     // Handle a deep copy situation
@@ -410 +556 @@
         deep = target;
         target = arguments[1] || {};
+        // skip the boolean and the target
+        i = 2;
     }
 
+    // Handle case when target is a string or something (possible in deep copy)
+    if ( typeof target != "object" && typeof target != "function" )
+        target = {};
+
     // extend jQuery itself if only one argument is passed
-    if ( al == 1 ) {
+    if ( length == i ) {
         target = this;
-        a = 0;
+        --i;
     }
 
-    var prop;
-
-    for ( ; a < al; a++ )
+    for ( ; i < length; i++ )
         // Only deal with non-null/undefined values
-        if ( (prop = arguments[a]) != null )
+        if ( (options = arguments[ i ]) != null )
             // Extend the base object
-            for ( var i in prop ) {
+            for ( var name in options ) {
+                var src = target[ name ], copy = options[ name ];
+
                 // Prevent never-ending loop
-                if ( target == prop[i] )
+                if ( target === copy )
                     continue;
 
                 // Recurse if we're merging object values
-                if ( deep && typeof prop[i] == 'object' && target[i] )
-                    jQuery.extend( target[i], prop[i] );
+                if ( deep && copy && typeof copy == "object" && !copy.nodeType )
+                    target[ name ] = jQuery.extend( deep, 
+                        // Never move original objects, clone them
+                        src || ( copy.length != null ? [ ] : { } )
+                    , copy );
 
                 // Don't bring in undefined values
-                else if ( prop[i] != undefined )
-                    target[i] = prop[i];
+                else if ( copy !== undefined )
+                    target[ name ] = copy;
+
             }
 
@@ -442 +598 @@
 };
 
-var expando = "jQuery" + (new Date()).getTime(), uuid = 0, win = {};
+var expando = "jQuery" + now(), uuid = 0, windowData = {},
+    // exclude the following css properties to add px
+    exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+    // cache defaultView
+    defaultView = document.defaultView || {};
 
 jQuery.extend({
-    noConflict: function(deep) {
+    noConflict: function( deep ) {
         window.$ = _$;
+
         if ( deep )
             window.jQuery = _jQuery;
+
         return jQuery;
     },
 
-    // This may seem like some crazy code, but trust me when I say that this
-    // is the only cross-browser way to do this. --John
+    // See test/unit/core.js for details concerning this function.
     isFunction: function( fn ) {
-        return !!fn && typeof fn != "string" && !fn.nodeName && 
-            fn.constructor != Array && /function/i.test( fn + "" );
-    },
-    
-    // check if an element is in a XML document
-    isXMLDoc: function(elem) {
+        return !!fn && typeof fn != "string" && !fn.nodeName &&
+            fn.constructor != Array && /^[\s[]?function/.test( fn + "" );
+    },
+
+    // check if an element is in a (or is an) XML document
+    isXMLDoc: function( elem ) {
         return elem.documentElement && !elem.body ||
             elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
@@ -466 +627 @@
 
     // Evalulates a script in a global context
-    // Evaluates Async. in Safari 2 :-(
     globalEval: function( data ) {
         data = jQuery.trim( data );
+
         if ( data ) {
-            if ( window.execScript )
-                window.execScript( data );
-            else if ( jQuery.browser.safari )
-                // safari doesn't provide a synchronous global eval
-                window.setTimeout( data, 0 );
+            // Inspired by code by Andrea Giammarchi
+            // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+            var head = document.getElementsByTagName("head")[0] || document.documentElement,
+                script = document.createElement("script");
+
+            script.type = "text/javascript";
+            if ( jQuery.browser.msie )
+                script.text = data;
             else
-                eval.call( window, data );
+                script.appendChild( document.createTextNode( data ) );
+
+            // Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+            // This arises when a base node is used (#2709).
+            head.insertBefore( script, head.firstChild );
+            head.removeChild( script );
         }
     },
@@ -483 +652 @@
         return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
     },
-    
+
     cache: {},
-    
+
     data: function( elem, name, data ) {
-        elem = elem == window ? win : elem;
+        elem = elem == window ?
+            windowData :
+            elem;
 
         var id = elem[ expando ];
 
         // Compute a unique ID for the element
-        if ( !id ) 
+        if ( !id )
             id = elem[ expando ] = ++uuid;
 
@@ -499 +670 @@
         if ( name && !jQuery.cache[ id ] )
             jQuery.cache[ id ] = {};
-        
+
         // Prevent overriding the named cache with undefined values
-        if ( data != undefined )
+        if ( data !== undefined )
             jQuery.cache[ id ][ name ] = data;
-        
-        // Return the named cache data, or the ID for the element   
-        return name ? jQuery.cache[ id ][ name ] : id;
-    },
-    
+
+        // Return the named cache data, or the ID for the element
+        return name ?
+            jQuery.cache[ id ][ name ] :
+            id;
+    },
+
     removeData: function( elem, name ) {
-        elem = elem == window ? win : elem;
+        elem = elem == window ?
+            windowData :
+            elem;
 
         var id = elem[ expando ];
@@ -521 +696 @@
                 // If we've removed all the data, remove the element's cache
                 name = "";
-                for ( name in jQuery.cache[ id ] ) break;
+
+                for ( name in jQuery.cache[ id ] )
+                    break;
+
                 if ( !name )
                     jQuery.removeData( elem );
@@ -544 +722 @@
 
     // args is for internal usage only
-    each: function( obj, fn, args ) {
+    each: function( object, callback, args ) {
+        var name, i = 0, length = object.length;
+
         if ( args ) {
-            if ( obj.length == undefined )
-                for ( var i in obj )
-                    fn.apply( obj[i], args );
-            else
-                for ( var i = 0, ol = obj.length; i < ol; i++ )
-                    if ( fn.apply( obj[i], args ) === false ) break;
+            if ( length == undefined ) {
+                for ( name in object )
+                    if ( callback.apply( object[ name ], args ) === false )
+                        break;
+            } else
+                for ( ; i < length; )
+                    if ( callback.apply( object[ i++ ], args ) === false )
+                        break;
 
         // A special, fast, case for the most common use of each
         } else {
-            if ( obj.length == undefined )
-                for ( var i in obj )
-                    fn.call( obj[i], i, obj[i] );
-            else
-                for ( var i = 0, ol = obj.length, val = obj[0]; 
-                    i < ol && fn.call(val,i,val) !== false; val = obj[++i] ){}
-        }
-
-        return obj;
-    },
-    
-    prop: function(elem, value, type, index, prop){
-            // Handle executable functions
-            if ( jQuery.isFunction( value ) )
-                value = value.call( elem, [index] );
-                
-            // exclude the following css properties to add px
-            var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
-
-            // Handle passing in a number to a CSS property
-            return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
-                value + "px" :
-                value;
+            if ( length == undefined ) {
+                for ( name in object )
+                    if ( callback.call( object[ name ], name, object[ name ] ) === false )
+                        break;
+            } else
+                for ( var value = object[0];
+                    i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
+        }
+
+        return object;
+    },
+
+    prop: function( elem, value, type, i, name ) {
+        // Handle executable functions
+        if ( jQuery.isFunction( value ) )
+            value = value.call( elem, i );
+
+        // Handle passing in a number to a CSS property
+        return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
+            value + "px" :
+            value;
     },
 
     className: {
         // internal only, use addClass("class")
-        add: function( elem, c ){
-            jQuery.each( (c || "").split(/\s+/), function(i, cur){
-                if ( !jQuery.className.has( elem.className, cur ) )
-                    elem.className += ( elem.className ? " " : "" ) + cur;
+        add: function( elem, classNames ) {
+            jQuery.each((classNames || "").split(/\s+/), function(i, className){
+                if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
+                    elem.className += (elem.className ? " " : "") + className;
             });
         },
 
         // internal only, use removeClass("class")
-        remove: function( elem, c ){
-            elem.className = c != undefined ?
-                jQuery.grep( elem.className.split(/\s+/), function(cur){
-                    return !jQuery.className.has( c, cur ); 
-                }).join(" ") : "";
+        remove: function( elem, classNames ) {
+            if (elem.nodeType == 1)
+                elem.className = classNames != undefined ?
+                    jQuery.grep(elem.className.split(/\s+/), function(className){
+                        return !jQuery.className.has( classNames, className );
+                    }).join(" ") :
+                    "";
         },
 
-        // internal only, use is(".class")
-        has: function( t, c ) {
-            return jQuery.inArray( c, (t.className || t).toString().split(/\s+/) ) > -1;
-        }
-    },
-
-    swap: function(e,o,f) {
-        for ( var i in o ) {
-            e.style["old"+i] = e.style[i];
-            e.style[i] = o[i];
-        }
-        f.apply( e, [] );
-        for ( var i in o )
-            e.style[i] = e.style["old"+i];
-    },
-
-    css: function(e,p) {
-        if ( p == "height" || p == "width" ) {
-            var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
-
-            jQuery.each( d, function(){
-                old["padding" + this] = 0;
-                old["border" + this + "Width"] = 0;
-            });
-
-            jQuery.swap( e, old, function() {
-                if ( jQuery(e).is(':visible') ) {
-                    oHeight = e.offsetHeight;
-                    oWidth = e.offsetWidth;
-                } else {
-                    e = jQuery(e.cloneNode(true))
-                        .find(":radio").removeAttr("checked").end()
-                        .css({
-                            visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
-                        }).appendTo(e.parentNode)[0];
-
-                    var parPos = jQuery.css(e.parentNode,"position") || "static";
-                    if ( parPos == "static" )
-                        e.parentNode.style.position = "relative";
-
-                    oHeight = e.clientHeight;
-                    oWidth = e.clientWidth;
-
-                    if ( parPos == "static" )
-                        e.parentNode.style.position = "static";
-
-                    e.parentNode.removeChild(e);
-                }
-            });
-
-            return p == "height" ? oHeight : oWidth;
-        }
-
-        return jQuery.curCSS( e, p );
-    },
-
-    curCSS: function(elem, prop, force) {
-        var ret, stack = [], swap = [];
+        // internal only, use hasClass("class")
+        has: function( elem, className ) {
+            return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
+        }
+    },
+
+    // A method for quickly swapping in/out CSS properties to get correct calculations
+    swap: function( elem, options, callback ) {
+        var old = {};
+        // Remember the old values, and insert the new ones
+        for ( var name in options ) {
+            old[ name ] = elem.style[ name ];
+            elem.style[ name ] = options[ name ];
+        }
+
+        callback.call( elem );
+
+        // Revert the old values
+        for ( var name in options )
+            elem.style[ name ] = old[ name ];
+    },
+
+    css: function( elem, name, force ) {
+        if ( name == "width" || name == "height" ) {
+            var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
+
+            function getWH() {
+                val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
+                var padding = 0, border = 0;
+                jQuery.each( which, function() {
+                    padding += parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
+                    border += parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+                });
+                val -= Math.round(padding + border);
+            }
+
+            if ( jQuery(elem).is(":visible") )
+                getWH();
+            else
+                jQuery.swap( elem, props, getWH );
+
+            return Math.max(0, val);
+        }
+
+        return jQuery.curCSS( elem, name, force );
+    },
+
+    curCSS: function( elem, name, force ) {
+        var ret, style = elem.style;
 
         // A helper method for determining if an element's values are broken
-        function color(a){
+        function color( elem ) {
             if ( !jQuery.browser.safari )
                 return false;
 
-            var ret = document.defaultView.getComputedStyle(a,null);
+            // defaultView is cached
+            var ret = defaultView.getComputedStyle( elem, null );
             return !ret || ret.getPropertyValue("color") == "";
         }
 
-        if (prop == "opacity" && jQuery.browser.msie) {
-            ret = jQuery.attr(elem.style, "opacity");
-            return ret == "" ? "1" : ret;
-        }
-        
-        if (prop.match(/float/i))
-            prop = styleFloat;
-
-        if (!force && elem.style[prop])
-            ret = elem.style[prop];
-
-        else if (document.defaultView && document.defaultView.getComputedStyle) {
-
-            if (prop.match(/float/i))
-                prop = "float";
-
-            prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
-            var cur = document.defaultView.getComputedStyle(elem, null);
-
-            if ( cur && !color(elem) )
-                ret = cur.getPropertyValue(prop);
+        // We need to handle opacity special in IE
+        if ( name == "opacity" && jQuery.browser.msie ) {
+            ret = jQuery.attr( style, "opacity" );
+
+            return ret == "" ?
+                "1" :
+                ret;
+        }
+        // Opera sometimes will give the wrong display answer, this fixes it, see #2037
+        if ( jQuery.browser.opera && name == "display" ) {
+            var save = style.outline;
+            style.outline = "0 solid black";
+            style.outline = save;
+        }
+
+        // Make sure we're using the right name for getting the float value
+        if ( name.match( /float/i ) )
+            name = styleFloat;
+
+        if ( !force && style && style[ name ] )
+            ret = style[ name ];
+
+        else if ( defaultView.getComputedStyle ) {
+
+            // Only "float" is needed here
+            if ( name.match( /float/i ) )
+                name = "float";
+
+            name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
+
+            var computedStyle = defaultView.getComputedStyle( elem, null );
+
+            if ( computedStyle && !color( elem ) )
+                ret = computedStyle.getPropertyValue( name );
 
             // If the element isn't reporting its values properly in Safari
             // then some display: none elements are involved
             else {
+                var swap = [], stack = [], a = elem, i = 0;
+
                 // Locate all of the parent display: none elements
-                for ( var a = elem; a && color(a); a = a.parentNode )
+                for ( ; a && color(a); a = a.parentNode )
                     stack.unshift(a);
 
                 // Go through and make them visible, but in reverse
                 // (It would be better if we knew the exact display type that they had)
-                for ( a = 0; a < stack.length; a++ )
-                    if ( color(stack[a]) ) {
-                        swap[a] = stack[a].style.display;
-                        stack[a].style.display = "block";
+                for ( ; i < stack.length; i++ )
+                    if ( color( stack[ i ] ) ) {
+                        swap[ i ] = stack[ i ].style.display;
+                        stack[ i ].style.display = "block";
                     }
 
                 // Since we flip the display style, we have to handle that
                 // one special, otherwise get the value
-                ret = prop == "display" && swap[stack.length-1] != null ?
+                ret = name == "display" && swap[ stack.length - 1 ] != null ?
                     "none" :
-                    document.defaultView.getComputedStyle(elem,null).getPropertyValue(prop) || "";
+                    ( computedStyle && computedStyle.getPropertyValue( name ) ) || "";
 
                 // Finally, revert the display styles back
-                for ( a = 0; a < swap.length; a++ )
-                    if ( swap[a] != null )
-                        stack[a].style.display = swap[a];
-            }
-
-            if ( prop == "opacity" && ret == "" )
+                for ( i = 0; i < swap.length; i++ )
+                    if ( swap[ i ] != null )
+                        stack[ i ].style.display = swap[ i ];
+            }
+
+            // We should always get a number back from opacity
+            if ( name == "opacity" && ret == "" )
                 ret = "1";
 
-        } else if (elem.currentStyle) {
-            var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
-            ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
+        } else if ( elem.currentStyle ) {
+            var camelCase = name.replace(/\-(\w)/g, function(all, letter){
+                return letter.toUpperCase();
+            });
+
+            ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
 
             // From the awesome hack by Dean Edwards
@@ -726 +919 @@
             // If we're not dealing with a regular pixel number
             // but a number that has a weird ending, we need to convert it to pixels
-            if ( !/^\d+(px)?$/i.test(ret) && /^\d/.test(ret) ) {
-                var style = elem.style.left;
-                var runtimeStyle = elem.runtimeStyle.left;
+            if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
+                // Remember the original values
+                var left = style.left, rsLeft = elem.runtimeStyle.left;
+
+                // Put in the new values to get a computed value out
                 elem.runtimeStyle.left = elem.currentStyle.left;
-                elem.style.left = ret || 0;
-                ret = elem.style.pixelLeft + "px";
-                elem.style.left = style;
-                elem.runtimeStyle.left = runtimeStyle;
+                style.left = ret || 0;
+                ret = style.pixelLeft + "px";
+
+                // Revert the changed values
+                style.left = left;
+                elem.runtimeStyle.left = rsLeft;
             }
         }
@@ -739 +936 @@
         return ret;
     },
-    
-    clean: function(a, doc) {
-        var r = [];
-        doc = doc || document;
-
-        jQuery.each( a, function(i,arg){
-            if ( !arg ) return;
-
-            if ( arg.constructor == Number )
-                arg = arg.toString();
-            
+
+    clean: function( elems, context ) {
+        var ret = [];
+        context = context || document;
+        // !context.createElement fails in IE with an error but returns typeof 'object'
+        if (typeof context.createElement == 'undefined')
+            context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+
+        jQuery.each(elems, function(i, elem){
+            if ( !elem )
+                return;
+
+            if ( elem.constructor == Number )
+                elem += '';
+
             // Convert html string into DOM nodes
-            if ( typeof arg == "string" ) {
+            if ( typeof elem == "string" ) {
                 // Fix "XHTML"-style tags in all browsers
-                arg = arg.replace(/(<(\w+)[^>]*?)\/>/g, function(m, all, tag){
-                    return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area)$/i)? m : all+"></"+tag+">";
+                elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
+                    return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
+                        all :
+                        front + "></" + tag + ">";
                 });
 
                 // Trim whitespace, otherwise indexOf won't work as expected
-                var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = [];
+                var tags = jQuery.trim( elem ).toLowerCase(), div = context.createElement("div");
 
                 var wrap =
                     // option or optgroup
-                    !s.indexOf("<opt") &&
-                    [1, "<select>", "</select>"] ||
-                    
-                    !s.indexOf("<leg") &&
-                    [1, "<fieldset>", "</fieldset>"] ||
-                    
-                    s.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
-                    [1, "<table>", "</table>"] ||
-                    
-                    !s.indexOf("<tr") &&
-                    [2, "<table><tbody>", "</tbody></table>"] ||
-                    
+                    !tags.indexOf("<opt") &&
+                    [ 1, "<select multiple='multiple'>", "</select>" ] ||
+
+                    !tags.indexOf("<leg") &&
+                    [ 1, "<fieldset>", "</fieldset>" ] ||
+
+                    tags.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
+                    [ 1, "<table>", "</table>" ] ||
+
+                    !tags.indexOf("<tr") &&
+                    [ 2, "<table><tbody>", "</tbody></table>" ] ||
+
                     // <thead> matched above
-                    (!s.indexOf("<td") || !s.indexOf("<th")) &&
-                    [3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
-                    
-                    !s.indexOf("<col") &&
-                    [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"] ||
+                    (!tags.indexOf("<td") || !tags.indexOf("<th")) &&
+                    [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] ||
+
+                    !tags.indexOf("<col") &&
+                    [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] ||
 
                     // IE can't serialize <link> and <script> tags normally
                     jQuery.browser.msie &&
-                    [1, "div<div>", "</div>"] ||
-                    
-                    [0,"",""];
+                    [ 1, "div<div>", "</div>" ] ||
+
+                    [ 0, "", "" ];
 
                 // Go to html and back, then peel off extra wrappers
-                div.innerHTML = wrap[1] + arg + wrap[2];
-                
+                div.innerHTML = wrap[1] + elem + wrap[2];
+
                 // Move to the right depth
                 while ( wrap[0]-- )
                     div = div.lastChild;
-                
+
                 // Remove IE's autoinserted <tbody> from table fragments
                 if ( jQuery.browser.msie ) {
-                    
+
                     // String was a <table>, *may* have spurious <tbody>
-                    if ( !s.indexOf("<table") && s.indexOf("<tbody") < 0 ) 
-                        tb = div.firstChild && div.firstChild.childNodes;
-                        
-                    // String was a bare <thead> or <tfoot>
-                    else if ( wrap[1] == "<table>" && s.indexOf("<tbody") < 0 )
-                        tb = div.childNodes;
-
-                    for ( var n = tb.length-1; n >= 0 ; --n )
-                        if ( jQuery.nodeName(tb[n], "tbody") && !tb[n].childNodes.length )
-                            tb[n].parentNode.removeChild(tb[n]);
-    
-                    // IE completely kills leading whitespace when innerHTML is used    
-                    if ( /^\s/.test(arg) )  
-                        div.insertBefore( doc.createTextNode( arg.match(/^\s*/)[0] ), div.firstChild );
+                    var tbody = !tags.indexOf("<table") && tags.indexOf("<tbody") < 0 ?
+                        div.firstChild && div.firstChild.childNodes :
+
+                        // String was a bare <thead> or <tfoot>
+                        wrap[1] == "<table>" && tags.indexOf("<tbody") < 0 ?
+                            div.childNodes :
+                            [];
+
+                    for ( var j = tbody.length - 1; j >= 0 ; --j )
+                        if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
+                            tbody[ j ].parentNode.removeChild( tbody[ j ] );
+
+                    // IE completely kills leading whitespace when innerHTML is used
+                    if ( /^\s/.test( elem ) )
+                        div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
 
                 }
-                
-                arg = jQuery.makeArray( div.childNodes );
-            }
-
-            if ( 0 === arg.length && (!jQuery.nodeName(arg, "form") && !jQuery.nodeName(arg, "select")) )
+
+                elem = jQuery.makeArray( div.childNodes );
+            }
+
+            if ( elem.length === 0 && (!jQuery.nodeName( elem, "form" ) && !jQuery.nodeName( elem, "select" )) )
                 return;
 
-            if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options )
-                r.push( arg );
+            if ( elem[0] == undefined || jQuery.nodeName( elem, "form" ) || elem.options )
+                ret.push( elem );
+
             else
-                r = jQuery.merge( r, arg );
+                ret = jQuery.merge( ret, elem );
 
         });
 
-        return r;
-    },
-    
-    attr: function(elem, name, value){
-        var fix = jQuery.isXMLDoc(elem) ? {} : jQuery.props;
-
-        // Safari mis-reports the default selected property of a hidden option
-        // Accessing the parent's selectedIndex property fixes it
-        if ( name == "selected" && jQuery.browser.safari )
-            elem.parentNode.selectedIndex;
-        
-        // Certain attributes only work when accessed via the old DOM 0 way
-        if ( fix[name] ) {
-            if ( value != undefined ) elem[fix[name]] = value;
-            return elem[fix[name]];
-        } else if ( jQuery.browser.msie && name == "style" )
-            return jQuery.attr( elem.style, "cssText", value );
-
-        else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName(elem, "form") && (name == "action" || name == "method") )
-            return elem.getAttributeNode(name).nodeValue;
-
+        return ret;
+    },
+
+    attr: function( elem, name, value ) {
+        // don't set attributes on text and comment nodes
+        if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
+            return undefined;
+
+        var notxml = !jQuery.isXMLDoc( elem ),
+            // Whether we are setting (or getting)
+            set = value !== undefined,
+            msie = jQuery.browser.msie;
+
+        // Try to normalize/fix the name
+        name = notxml && jQuery.props[ name ] || name;
+
+        // Only do all the following if this is a node (faster for style)
         // IE elem.getAttribute passes even for style
-        else if ( elem.tagName ) {
-
-            if ( value != undefined ) {
-                if ( name == "type" && jQuery.nodeName(elem,"input") && elem.parentNode )
-                    throw "type property can't be changed";
-                elem.setAttribute( name, value );
-            }
-
-            if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) 
-                return elem.getAttribute( name, 2 );
-
-            return elem.getAttribute( name );
+        if ( elem.tagName ) {
+
+            // These attributes require special treatment
+            var special = /href|src|style/.test( name );
+
+            // Safari mis-reports the default selected property of a hidden option
+            // Accessing the parent's selectedIndex property fixes it
+            if ( name == "selected" && jQuery.browser.safari )
+                elem.parentNode.selectedIndex;
+
+            // If applicable, access the attribute via the DOM 0 way
+            if ( name in elem && notxml && !special ) {
+                if ( set ){
+                    // We can't allow the type property to be changed (since it causes problems in IE)
+                    if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
+                        throw "type property can't be changed";
+
+                    elem[ name ] = value;
+                }
+
+                // browsers index elements by id/name on forms, give priority to attributes.
+                if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) )
+                    return elem.getAttributeNode( name ).nodeValue;
+
+                return elem[ name ];
+            }
+
+            if ( msie && notxml &&  name == "style" )
+                return jQuery.attr( elem.style, "cssText", value );
+
+            if ( set )
+                // convert the value to a string (all browsers do this but IE) see #1070
+                elem.setAttribute( name, "" + value );
+
+            var attr = msie && notxml && special
+                    // Some attributes require a special call on IE
+                    ? elem.getAttribute( name, 2 )
+                    : elem.getAttribute( name );
+
+            // Non-existent attributes return null, we normalize to undefined
+            return attr === null ? undefined : attr;
+        }
 
         // elem is actually elem.style ... set the style
-        } else {
-            // IE actually uses filters for opacity
-            if ( name == "opacity" && jQuery.browser.msie ) {
-                if ( value != undefined ) {
-                    // IE has trouble with opacity if it does not have layout
-                    // Force it by setting the zoom level
-                    elem.zoom = 1; 
-    
-                    // Set the alpha filter to set the opacity
-                    elem.filter = (elem.filter || "").replace(/alpha\([^)]*\)/,"") +
-                        (parseFloat(value).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
-                }
-    
-                return elem.filter ? 
-                    (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : "";
-            }
-            name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
-            if ( value != undefined ) elem[name] = value;
-            return elem[name];
-        }
-    },
-    
-    trim: function(t){
-        return (t||"").replace(/^\s+|\s+$/g, "");
-    },
-
-    makeArray: function( a ) {
-        var r = [];
-
-        // Need to use typeof to fight Safari childNodes crashes
-        if ( typeof a != "array" )
-            for ( var i = 0, al = a.length; i < al; i++ )
-                r.push( a[i] );
-        else
-            r = a.slice( 0 );
-
-        return r;
-    },
-
-    inArray: function( b, a ) {
-        for ( var i = 0, al = a.length; i < al; i++ )
-            if ( a[i] == b )
+
+        // IE uses filters for opacity
+        if ( msie && name == "opacity" ) {
+            if ( set ) {
+                // IE has trouble with opacity if it does not have layout
+                // Force it by setting the zoom level
+                elem.zoom = 1;
+
+                // Set the alpha filter to set the opacity
+                elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) +
+                    (parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+            }
+
+            return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
+                (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+                "";
+        }
+
+        name = name.replace(/-([a-z])/ig, function(all, letter){
+            return letter.toUpperCase();
+        });
+
+        if ( set )
+            elem[ name ] = value;
+
+        return elem[ name ];
+    },
+
+    trim: function( text ) {
+        return (text || "").replace( /^\s+|\s+$/g, "" );
+    },
+
+    makeArray: function( array ) {
+        var ret = [];
+
+        if( array != null ){
+            var i = array.length;
+            //the window, strings and functions also have 'length'
+            if( i == null || array.split || array.setInterval || array.call )
+                ret[0] = array;
+            else
+                while( i )
+                    ret[--i] = array[i];
+        }
+
+        return ret;
+    },
+
+    inArray: function( elem, array ) {
+        for ( var i = 0, length = array.length; i < length; i++ )
+        // Use === because on IE, window == document
+            if ( array[ i ] === elem )
                 return i;
+
         return -1;
     },
 
-    merge: function(first, second) {
+    merge: function( first, second ) {
         // We have to loop this way because IE & Opera overwrite the length
         // expando of getElementsByTagName
-
+        var i = 0, elem, pos = first.length;
         // Also, we need to make sure that the correct elements are being returned
         // (IE returns comment nodes in a '*' query)
         if ( jQuery.browser.msie ) {
-            for ( var i = 0; second[i]; i++ )
-                if ( second[i].nodeType != 8 )
-                    first.push(second[i]);
+            while ( elem = second[ i++ ] )
+                if ( elem.nodeType != 8 )
+                    first[ pos++ ] = elem;
+
         } else
-            for ( var i = 0; second[i]; i++ )
-                first.push(second[i]);
+            while ( elem = second[ i++ ] )
+                first[ pos++ ] = elem;
 
         return first;
     },
 
-    unique: function(first) {
-        var r = [], done = {};
+    unique: function( array ) {
+        var ret = [], done = {};
 
         try {
-            for ( var i = 0, fl = first.length; i < fl; i++ ) {
-                var id = jQuery.data(first[i]);
-                if ( !done[id] ) {
-                    done[id] = true;
-                    r.push(first[i]);
+
+            for ( var i = 0, length = array.length; i < length; i++ ) {
+                var id = jQuery.data( array[ i ] );
+
+                if ( !done[ id ] ) {
+                    done[ id ] = true;
+                    ret.push( array[ i ] );
                 }
             }
-        } catch(e) {
-            r = first;
-        }
-
-        return r;
-    },
-
-    grep: function(elems, fn, inv) {
-        // If a string is passed in for the function, make a function
-        // for it (a handy shortcut)
-        if ( typeof fn == "string" )
-            fn = eval("false||function(a,i){return " + fn + "}");
-
-        var result = [];
+
+        } catch( e ) {
+            ret = array;
+        }
+
+        return ret;
+    },
+
+    grep: function( elems, callback, inv ) {
+        var ret = [];
 
         // Go through the array, only saving the items
         // that pass the validator function
-        for ( var i = 0, el = elems.length; i < el; i++ )
-            if ( !inv && fn(elems[i],i) || inv && !fn(elems[i],i) )
-                result.push( elems[i] );
-
-        return result;
-    },
-
-    map: function(elems, fn) {
-        // If a string is passed in for the function, make a function
-        // for it (a handy shortcut)
-        if ( typeof fn == "string" )
-            fn = eval("false||function(a){return " + fn + "}");
-
-        var result = [];
+        for ( var i = 0, length = elems.length; i < length; i++ )
+            if ( !inv != !callback( elems[ i ], i ) )
+                ret.push( elems[ i ] );
+
+        return ret;
+    },
+
+    map: function( elems, callback ) {
+        var ret = [];
 
         // Go through the array, translating each of the items to their
         // new value (or values).
-        for ( var i = 0, el = elems.length; i < el; i++ ) {
-            var val = fn(elems[i],i);
-
-            if ( val !== null && val != undefined ) {
-                if ( val.constructor != Array ) val = [val];
-                result = result.concat( val );
-            }
-        }
-
-        return result;
+        for ( var i = 0, length = elems.length; i < length; i++ ) {
+            var value = callback( elems[ i ], i );
+
+            if ( value != null )
+                ret[ ret.length ] = value;
+        }
+
+        return ret.concat.apply( [], ret );
     }
 });
@@ -989 +1223 @@
 // Figure out what browser is being used
 jQuery.browser = {
-    version: (userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
-    safari: /webkit/.test(userAgent),
-    opera: /opera/.test(userAgent),
-    msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
-    mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
+    version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1],
+    safari: /webkit/.test( userAgent ),
+    opera: /opera/.test( userAgent ),
+    msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
+    mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent )
 };
 
-var styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat";
-    
+var styleFloat = jQuery.browser.msie ?
+    "styleFloat" :
+    "cssFloat";
+
 jQuery.extend({
     // Check to see if the W3C box model is being used
     boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
-    
-    styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
-    
+
     props: {
         "for": "htmlFor",
@@ -1010 +1244 @@
         cssFloat: styleFloat,
         styleFloat: styleFloat,
-        innerHTML: "innerHTML",
-        className: "className",
-        value: "value",
-        disabled: "disabled",
-        checked: "checked",
         readonly: "readOnly",
-        selected: "selected",
-        maxlength: "maxLength"
+        maxlength: "maxLength",
+        cellspacing: "cellSpacing"
     }
 });
 
 jQuery.each({
-    parent: "a.parentNode",
-    parents: "jQuery.dir(a,'parentNode')",
-    next: "jQuery.nth(a,2,'nextSibling')",
-    prev: "jQuery.nth(a,2,'previousSibling')",
-    nextAll: "jQuery.dir(a,'nextSibling')",
-    prevAll: "jQuery.dir(a,'previousSibling')",
-    siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
-    children: "jQuery.sibling(a.firstChild)",
-    contents: "jQuery.nodeName(a,'iframe')?a.contentDocument||a.contentWindow.document:jQuery.makeArray(a.childNodes)"
-}, function(i,n){
-    jQuery.fn[ i ] = function(a) {
-        var ret = jQuery.map(this,n);
-        if ( a && typeof a == "string" )
-            ret = jQuery.multiFilter(a,ret);
-        return this.pushStack( jQuery.unique(ret) );
+    parent: function(elem){return elem.parentNode;},
+    parents: function(elem){return jQuery.dir(elem,"parentNode");},
+    next: function(elem){return jQuery.nth(elem,2,"nextSibling");},
+    prev: function(elem){return jQuery.nth(elem,2,"previousSibling");},
+    nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
+    prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
+    siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
+    children: function(elem){return jQuery.sibling(elem.firstChild);},
+    contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
+}, function(name, fn){
+    jQuery.fn[ name ] = function( selector ) {
+        var ret = jQuery.map( this, fn );
+
+        if ( selector && typeof selector == "string" )
+            ret = jQuery.multiFilter( selector, ret );
+
+        return this.pushStack( jQuery.unique( ret ) );
     };
 });
@@ -1046 +1277 @@
     insertAfter: "after",
     replaceAll: "replaceWith"
-}, function(i,n){
-    jQuery.fn[ i ] = function(){
-        var a = arguments;
+}, function(name, original){
+    jQuery.fn[ name ] = function() {
+        var args = arguments;
+
         return this.each(function(){
-            for ( var j = 0, al = a.length; j < al; j++ )
-                jQuery(a[j])[n]( this );
+            for ( var i = 0, length = args.length; i < length; i++ )
+                jQuery( args[ i ] )[ original ]( this );
         });
     };
 });
 
-jQuery.each( {
-    removeAttr: function( key ) {
-        jQuery.attr( this, key, "" );
-        this.removeAttribute( key );
-    },
-    addClass: function(c){
-        jQuery.className.add(this,c);
-    },
-    removeClass: function(c){
-        jQuery.className.remove(this,c);
-    },
-    toggleClass: function( c ){
-        jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this, c);
-    },
-    remove: function(a){
-        if ( !a || jQuery.filter( a, [this] ).r.length ) {
-            jQuery.removeData( this );
-            this.parentNode.removeChild( this );
-        }
-    },
+jQuery.each({
+    removeAttr: function( name ) {
+        jQuery.attr( this, name, "" );
+        if (this.nodeType == 1)
+            this.removeAttribute( name );
+    },
+
+    addClass: function( classNames ) {
+        jQuery.className.add( this, classNames );
+    },
+
+    removeClass: function( classNames ) {
+        jQuery.className.remove( this, classNames );
+    },
+
+    toggleClass: function( classNames ) {
+        jQuery.className[ jQuery.className.has( this, classNames ) ? "remove" : "add" ]( this, classNames );
+    },
+
+    remove: function( selector ) {
+        if ( !selector || jQuery.filter( selector, [ this ] ).r.length ) {
+            // Prevent memory leaks
+            jQuery( "*", this ).add(this).each(function(){
+                jQuery.event.remove(this);
+                jQuery.removeData(this);
+            });
+            if (this.parentNode)
+                this.parentNode.removeChild( this );
+        }
+    },
+
     empty: function() {
-        // Clean up the cache
-        jQuery("*", this).each(function(){ jQuery.removeData(this); });
-
+        // Remove element nodes and prevent memory leaks
+        jQuery( ">*", this ).remove();
+
+        // Remove any remaining nodes
         while ( this.firstChild )
             this.removeChild( this.firstChild );
     }
-}, function(i,n){
-    jQuery.fn[ i ] = function() {
-        return this.each( n, arguments );
+}, function(name, fn){
+    jQuery.fn[ name ] = function(){
+        return this.each( fn, arguments );
     };
 });
 
-jQuery.each( [ "Height", "Width" ], function(i,name){
-    var n = name.toLowerCase();
-    
-    jQuery.fn[ n ] = function(h) {
+jQuery.each([ "Height", "Width" ], function(i, name){
+    var type = name.toLowerCase();
+
+    jQuery.fn[ type ] = function( size ) {
+        // Get window width or height
         return this[0] == window ?
-            jQuery.browser.safari && self["inner" + name] ||
-            jQuery.boxModel && Math.max(document.documentElement["client" + name], document.body["client" + name]) ||
-            document.body["client" + name] :
-        
+            // Opera reports document.body.client[Width/Height] properly in both quirks and standards
+            jQuery.browser.opera && document.body[ "client" + name ] ||
+
+            // Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
+            jQuery.browser.safari && window[ "inner" + name ] ||
+
+            // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+            document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] :
+
+            // Get document width or height
             this[0] == document ?
-                Math.max( document.body["scroll" + name], document.body["offset" + name] ) :
-        
-                h == undefined ?
-                    ( this.length ? jQuery.css( this[0], n ) : null ) :
-                    this.css( n, h.constructor == String ? h : h + "px" );
+                // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+                Math.max(
+                    Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]),
+                    Math.max(document.body["offset" + name], document.documentElement["offset" + name])
+                ) :
+
+                // Get or set width or height on the element
+                size == undefined ?
+                    // Get width or height on the element
+                    (this.length ? jQuery.css( this[0], type ) : null) :
+
+                    // Set the width or height on the element (default to pixels if value is unitless)
+                    this.css( type, size.constructor == String ? size : size + "px" );
     };
 });
 
-var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
+// Helper function used by the dimensions and offset modules
+function num(elem, prop) {
+    return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
+}var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
         "(?:[\\w*_-]|\\\\.)" :
         "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
@@ -1116 +1378 @@
 jQuery.extend({
     expr: {
-        "": "m[2]=='*'||jQuery.nodeName(a,m[2])",
-        "#": "a.getAttribute('id')==m[2]",
+        "": function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},
+        "#": function(a,i,m){return a.getAttribute("id")==m[2];},
         ":": {
             // Position Checks
-            lt: "i<m[3]-0",
-            gt: "i>m[3]-0",
-            nth: "m[3]-0==i",
-            eq: "m[3]-0==i",
-            first: "i==0",
-            last: "i==r.length-1",
-            even: "i%2==0",
-            odd: "i%2",
+            lt: function(a,i,m){return i<m[3]-0;},
+            gt: function(a,i,m){return i>m[3]-0;},
+            nth: function(a,i,m){return m[3]-0==i;},
+            eq: function(a,i,m){return m[3]-0==i;},
+            first: function(a,i){return i==0;},
+            last: function(a,i,m,r){return i==r.length-1;},
+            even: function(a,i){return i%2==0;},
+            odd: function(a,i){return i%2;},
 
             // Child Checks
-            "first-child": "a.parentNode.getElementsByTagName('*')[0]==a",
-            "last-child": "jQuery.nth(a.parentNode.lastChild,1,'previousSibling')==a",
-            "only-child": "!jQuery.nth(a.parentNode.lastChild,2,'previousSibling')",
+            "first-child": function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},
+            "last-child": function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},
+            "only-child": function(a){return !jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},
 
             // Parent Checks
-            parent: "a.firstChild",
-            empty: "!a.firstChild",
+            parent: function(a){return a.firstChild;},
+            empty: function(a){return !a.firstChild;},
 
             // Text Check
-            contains: "(a.textContent||a.innerText||'').indexOf(m[3])>=0",
+            contains: function(a,i,m){return (a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},
 
             // Visibility
-            visible: '"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden"',
-            hidden: '"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden"',
+            visible: function(a){return "hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},
+            hidden: function(a){return "hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},
 
             // Form attributes
-            enabled: "!a.disabled",
-            disabled: "a.disabled",
-            checked: "a.checked",
-            selected: "a.selected||jQuery.attr(a,'selected')",
+            enabled: function(a){return !a.disabled;},
+            disabled: function(a){return a.disabled;},
+            checked: function(a){return a.checked;},
+            selected: function(a){return a.selected||jQuery.attr(a,"selected");},
 
             // Form elements
-            text: "'text'==a.type",
-            radio: "'radio'==a.type",
-            checkbox: "'checkbox'==a.type",
-            file: "'file'==a.type",
-            password: "'password'==a.type",
-            submit: "'submit'==a.type",
-            image: "'image'==a.type",
-            reset: "'reset'==a.type",
-            button: '"button"==a.type||jQuery.nodeName(a,"button")',
-            input: "/input|select|textarea|button/i.test(a.nodeName)",
+            text: function(a){return "text"==a.type;},
+            radio: function(a){return "radio"==a.type;},
+            checkbox: function(a){return "checkbox"==a.type;},
+            file: function(a){return "file"==a.type;},
+            password: function(a){return "password"==a.type;},
+            submit: function(a){return "submit"==a.type;},
+            image: function(a){return "image"==a.type;},
+            reset: function(a){return "reset"==a.type;},
+            button: function(a){return "button"==a.type||jQuery.nodeName(a,"button");},
+            input: function(a){return /input|select|textarea|button/i.test(a.nodeName);},
 
             // :has()
-            has: "jQuery.find(m[3],a).length",
+            has: function(a,i,m){return jQuery.find(m[3],a).length;},
 
             // :header
-            header: "/h\\d/i.test(a.nodeName)",
+            header: function(a){return /h\d/i.test(a.nodeName);},
 
             // :animated
-            animated: "jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length"
-        }
-    },
-    
+            animated: function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}
+        }
+    },
+
     // The regular expressions that power the parsing engine
     parse: [
@@ -1182 +1444 @@
         /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
 
-        // Match: :even, :last-chlid, #id, .class
+        // Match: :even, :last-child, #id, .class
         new RegExp("^([:.#]*)(" + chars + "+)")
     ],
@@ -1204 +1466 @@
             return [ t ];
 
-        // Make sure that the context is a DOM Element
-        if ( context && !context.nodeType )
-            context = null;
+        // check to make sure context is a DOM element or a document
+        if ( context && context.nodeType != 1 && context.nodeType != 9)
+            return [ ];
 
         // Set the correct context (if none is provided)
@@ -1212 +1474 @@
 
         // Initialize the search
-        var ret = [context], done = [], last;
+        var ret = [context], done = [], last, nodeName;
 
         // Continue while a selector expression exists, and while
@@ -1222 +1484 @@
             t = jQuery.trim(t);
 
-            var foundToken = false;
+            var foundToken = false,
 
             // An attempt at speeding up child selectors that
             // point to a specific element tag
-            var re = quickChild;
-            var m = re.exec(t);
+                re = quickChild,
+
+                m = re.exec(t);
 
             if ( m ) {
-                var nodeName = m[1].toUpperCase();
+                nodeName = m[1].toUpperCase();
 
                 // Perform our own iteration and filter
                 for ( var i = 0; ret[i]; i++ )
                     for ( var c = ret[i].firstChild; c; c = c.nextSibling )
-                        if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName.toUpperCase()) )
+                        if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName) )
                             r.push( c );
 
@@ -1248 +1511 @@
                     r = [];
 
-                    var nodeName = m[2], merge = {};
+                    var merge = {};
+                    nodeName = m[2].toUpperCase();
                     m = m[1];
 
@@ -1258 +1522 @@
 
                                 if ( m == "~" && merge[id] ) break;
-                                
-                                if (!nodeName || n.nodeName.toUpperCase() == nodeName.toUpperCase() ) {
+
+                                if (!nodeName || n.nodeName.toUpperCase() == nodeName ) {
                                     if ( m == "~" ) merge[id] = true;
                                     r.push( n );
                                 }
-                                
+
                                 if ( m == "+" ) break;
                             }
@@ -1297 +1561 @@
                     var re2 = quickID;
                     var m = re2.exec(t);
-                    
+
                     // Re-organize the results, so that they're consistent
                     if ( m ) {
-                       m = [ 0, m[2], m[3], m[1] ];
+                        m = [ 0, m[2], m[3], m[1] ];
 
                     } else {
@@ -1317 +1581 @@
                         // Optimization for HTML document case
                         var oid = elem.getElementById(m[2]);
-                        
+
                         // Do a quick check for the existence of the actual ID attribute
                         // to avoid selecting by the name attribute in IE
@@ -1405 +1669 @@
 
         // Look for common filter expressions
-        while ( t  && t != last ) {
+        while ( t && t != last ) {
             last = t;
 
@@ -1428 +1692 @@
             // keeping it out of the expression list
             if ( m[1] == ":" && m[2] == "not" )
-                r = jQuery.filter(m[3], r, true).r;
+                // optimize if only one selector found (most common case)
+                r = isSimple.test( m[3] ) ?
+                    jQuery.filter(m[3], r, true).r :
+                    jQuery( r ).not( m[3] );
 
             // We can get a big speed boost by filtering by class here
@@ -1436 +1703 @@
             else if ( m[1] == "[" ) {
                 var tmp = [], type = m[3];
-                
+
                 for ( var i = 0, rl = r.length; i < rl; i++ ) {
                     var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
-                    
+
                     if ( z == null || /href|src|selected/.test(m[2]) )
                         z = jQuery.attr(a,m[2]) || '';
@@ -1451 +1718 @@
                             tmp.push( a );
                 }
-                
+
                 r = tmp;
 
@@ -1457 +1724 @@
             } else if ( m[1] == ":" && m[2] == "nth-child" ) {
                 var merge = {}, tmp = [],
-                    test = /(\d*)n\+?(\d*)/.exec(
+                    // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+                    test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
                         m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" ||
-                        !/\D/.test(m[3]) && "n+" + m[3] || m[3]),
-                    first = (test[1] || 1) - 0, last = test[2] - 0;
-
+                        !/\D/.test(m[3]) && "0n+" + m[3] || m[3]),
+                    // calculate the numbers (first)n+(last) including if they are negative
+                    first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0;
+
+                // loop through all the elements left in the jQuery object
                 for ( var i = 0, rl = r.length; i < rl; i++ ) {
                     var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode);
@@ -1477 +1747 @@
                     var add = false;
 
-                    if ( first == 1 ) {
-                        if ( last == 0 || node.nodeIndex == last )
+                    if ( first == 0 ) {
+                        if ( node.nodeIndex == last )
                             add = true;
-                    } else if ( (node.nodeIndex + last) % first == 0 )
+                    } else if ( (node.nodeIndex - last) % first == 0 && (node.nodeIndex - last) / first >= 0 )
                         add = true;
 
@@ -1491 +1761 @@
             // Otherwise, find the expression to execute
             } else {
-                var f = jQuery.expr[m[1]];
-                if ( typeof f != "string" )
-                    f = jQuery.expr[m[1]][m[2]];
-
-                // Build a custom macro to enclose it
-                f = eval("false||function(a,i){return " + f + "}");
+                var fn = jQuery.expr[ m[1] ];
+                if ( typeof fn == "object" )
+                    fn = fn[ m[2] ];
+
+                if ( typeof fn == "string" )
+                    fn = eval("false||function(a,i){return " + fn + ";}");
 
                 // Execute it against the current filter
-                r = jQuery.grep( r, f, not );
+                r = jQuery.grep( r, function(elem, i){
+                    return fn(elem, i, m, r);
+                }, not );
             }
         }
@@ -1509 +1781 @@
 
     dir: function( elem, dir ){
-        var matched = [];
-        var cur = elem[dir];
+        var matched = [],
+            cur = elem[dir];
         while ( cur && cur != document ) {
             if ( cur.nodeType == 1 )
@@ -1518 +1790 @@
         return matched;
     },
-    
+
     nth: function(cur,result,dir,elem){
         result = result || 1;
@@ -1529 +1801 @@
         return cur;
     },
-    
+
     sibling: function( n, elem ) {
         var r = [];
 
         for ( ; n; n = n.nextSibling ) {
-            if ( n.nodeType == 1 && (!elem || n != elem) )
+            if ( n.nodeType == 1 && n != elem )
                 r.push( n );
         }
@@ -1543 +1815 @@
 /*
  * A number of helper functions used for managing events.
- * Many of the ideas behind this code orignated from 
+ * Many of the ideas behind this code orignated from
  * Dean Edwards' addEvent library.
  */
@@ -1550 +1822 @@
     // Bind an event to an element
     // Original by Dean Edwards
-    add: function(element, type, handler, data) {
+    add: function(elem, types, handler, data) {
+        if ( elem.nodeType == 3 || elem.nodeType == 8 )
+            return;
+
         // For whatever reason, IE has trouble passing the window object
         // around, causing it to be cloned in the process
-        if ( jQuery.browser.msie && element.setInterval != undefined )
-            element = window;
+        if ( jQuery.browser.msie && elem.setInterval )
+            elem = window;
 
         // Make sure that the function being executed has a unique ID
         if ( !handler.guid )
             handler.guid = this.guid++;
-            
-        // if data is passed, bind to handler 
-        if( data != undefined ) { 
-                // Create temporary function pointer to original handler 
-            var fn = handler; 
-
-            // Create unique handler function, wrapped around original handler 
-            handler = function() { 
-                // Pass arguments and context to original handler 
-                return fn.apply(this, arguments); 
-            };
-
-            // Store data in unique handler 
+
+        // if data is passed, bind to handler
+        if( data != undefined ) {
+            // Create temporary function pointer to original handler
+            var fn = handler;
+
+            // Create unique handler function, wrapped around original handler
+            handler = this.proxy( fn, function() {
+                // Pass arguments and context to original handler
+                return fn.apply(this, arguments);
+            });
+
+            // Store data in unique handler
             handler.data = data;
-
-            // Set the guid of unique handler to the same of original handler, so it can be removed 
-            handler.guid = fn.guid;
-        }
-
-        // Namespaced event handlers
-        var parts = type.split(".");
-        type = parts[0];
-        handler.type = parts[1];
+        }
 
         // Init the element's event structure
-        var events = jQuery.data(element, "events") || jQuery.data(element, "events", {});
-        
-        var handle = jQuery.data(element, "handle", function(){
-            // returned undefined or false
-            var val;
-
-            // Handle the second event of a trigger and when
-            // an event is called after a page has unloaded
-            if ( typeof jQuery == "undefined" || jQuery.event.triggered )
-                return val;
-            
-            val = jQuery.event.handle.apply(element, arguments);
-            
-            return val;
+        var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}),
+            handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){
+                // Handle the second event of a trigger and when
+                // an event is called after a page has unloaded
+                if ( typeof jQuery != "undefined" && !jQuery.event.triggered )
+                    return jQuery.event.handle.apply(arguments.callee.elem, arguments);
+            });
+        // Add elem as a property of the handle function
+        // This is to prevent a memory leak with non-native
+        // event in IE.
+        handle.elem = elem;
+
+        // Handle multiple events separated by a space
+        // jQuery(...).bind("mouseover mouseout", fn);
+        jQuery.each(types.split(/\s+/), function(index, type) {
+            // Namespaced event handlers
+            var parts = type.split(".");
+            type = parts[0];
+            handler.type = parts[1];
+
+            // Get the current list of functions bound to this event
+            var handlers = events[type];
+
+            // Init the event handler queue
+            if (!handlers) {
+                handlers = events[type] = {};
+
+                // Check for a special event handler
+                // Only use addEventListener/attachEvent if the special
+                // events handler returns false
+                if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) {
+                    // Bind the global event handler to the element
+                    if (elem.addEventListener)
+                        elem.addEventListener(type, handle, false);
+                    else if (elem.attachEvent)
+                        elem.attachEvent("on" + type, handle);
+                }
+            }
+
+            // Add the function to the element's handler list
+            handlers[handler.guid] = handler;
+
+            // Keep track of which events have been used, for global triggering
+            jQuery.event.global[type] = true;
         });
 
-        // Get the current list of functions bound to this event
-        var handlers = events[type];
-
-        // Init the event handler queue
-        if (!handlers) {
-            handlers = events[type] = {};   
-            
-            // And bind the global event handler to the element
-            if (element.addEventListener)
-                element.addEventListener(type, handle, false);
-            else
-                element.attachEvent("on" + type, handle);
-        }
-
-        // Add the function to the element's handler list
-        handlers[handler.guid] = handler;
-
-        // Keep track of which events have been used, for global triggering
-        this.global[type] = true;
+        // Nullify elem to prevent memory leaks in IE
+        elem = null;
     },
 
@@ -1625 +1905 @@
 
     // Detach an event or set of events from an element
-    remove: function(element, type, handler) {
-        var events = jQuery.data(element, "events"), ret, index;
-
-        // Namespaced event handlers
-        if ( typeof type == "string" ) {
-            var parts = type.split(".");
-            type = parts[0];
-        }
+    remove: function(elem, types, handler) {
+        // don't do events on text and comment nodes
+        if ( elem.nodeType == 3 || elem.nodeType == 8 )
+            return;
+
+        var events = jQuery.data(elem, "events"), ret, index;
 
         if ( events ) {
-            // type is actually an event object here
-            if ( type && type.type ) {
-                handler = type.handler;
-                type = type.type;
-            }
-            
-            if ( !type ) {
-                for ( type in events )
-                    this.remove( element, type );
-
-            } else if ( events[type] ) {
-                // remove the given handler for the given type
-                if ( handler )
-                    delete events[type][handler.guid];
-                
-                // remove all handlers for the given type
-                else
-                    for ( handler in events[type] )
-                        // Handle the removal of namespaced events
-                        if ( !parts[1] || events[type][handler].type == parts[1] )
-                            delete events[type][handler];
-
-                // remove generic event handler if no more handlers exist
-                for ( ret in events[type] ) break;
-                if ( !ret ) {
-                    if (element.removeEventListener)
-                        element.removeEventListener(type, jQuery.data(element, "handle"), false);
-                    else
-                        element.detachEvent("on" + type, jQuery.data(element, "handle"));
-                    ret = null;
-                    delete events[type];
+            // Unbind all events for the element
+            if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") )
+                for ( var type in events )
+                    this.remove( elem, type + (types || "") );
+            else {
+                // types is actually an event object here
+                if ( types.type ) {
+                    handler = types.handler;
+                    types = types.type;
                 }
+
+                // Handle multiple events seperated by a space
+                // jQuery(...).unbind("mouseover mouseout", fn);
+                jQuery.each(types.split(/\s+/), function(index, type){
+                    // Namespaced event handlers
+                    var parts = type.split(".");
+                    type = parts[0];
+
+                    if ( events[type] ) {
+                        // remove the given handler for the given type
+                        if ( handler )
+                            delete events[type][handler.guid];
+
+                        // remove all handlers for the given type
+                        else
+                            for ( handler in events[type] )
+                                // Handle the removal of namespaced events
+                                if ( !parts[1] || events[type][handler].type == parts[1] )
+                                    delete events[type][handler];
+
+                        // remove generic event handler if no more handlers exist
+                        for ( ret in events[type] ) break;
+                        if ( !ret ) {
+                            if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem) === false ) {
+                                if (elem.removeEventListener)
+                                    elem.removeEventListener(type, jQuery.data(elem, "handle"), false);
+                                else if (elem.detachEvent)
+                                    elem.detachEvent("on" + type, jQuery.data(elem, "handle"));
+                            }
+                            ret = null;
+                            delete events[type];
+                        }
+                    }
+                });
             }
 
@@ -1672 +1962 @@
             for ( ret in events ) break;
             if ( !ret ) {
-                jQuery.removeData( element, "events" );
-                jQuery.removeData( element, "handle" );
-            }
-        }
-    },
-
-    trigger: function(type, data, element, donative, extra) {
+                var handle = jQuery.data( elem, "handle" );
+                if ( handle ) handle.elem = null;
+                jQuery.removeData( elem, "events" );
+                jQuery.removeData( elem, "handle" );
+            }
+        }
+    },
+
+    trigger: function(type, data, elem, donative, extra) {
         // Clone the incoming data, if any
-        data = jQuery.makeArray(data || []);
+        data = jQuery.makeArray(data);
+
+        if ( type.indexOf("!") >= 0 ) {
+            type = type.slice(0, -1);
+            var exclusive = true;
+        }
 
         // Handle a global trigger
-        if ( !element ) {
+        if ( !elem ) {
             // Only trigger if we've ever bound an event for it
             if ( this.global[type] )
@@ -1690 +1987 @@
         // Handle triggering a single element
         } else {
-            var val, ret, fn = jQuery.isFunction( element[ type ] || null ),
+            // don't do events on text and comment nodes
+            if ( elem.nodeType == 3 || elem.nodeType == 8 )
+                return undefined;
+
+            var val, ret, fn = jQuery.isFunction( elem[ type ] || null ),
                 // Check to see if we need to provide a fake event, or not
-                evt = !data[0] || !data[0].preventDefault;
-            
+                event = !data[0] || !data[0].preventDefault;
+
             // Pass along a fake event
-            if ( evt )
-                data.unshift( this.fix({ type: type, target: element }) );
-
-            // Trigger the event
-            if ( jQuery.isFunction( jQuery.data(element, "handle") ) )
-                val = jQuery.data(element, "handle").apply( element, data );
-
-            // Handle triggering native .onfoo handlers
-            if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
+            if ( event ) {
+                data.unshift({
+                    type: type,
+                    target: elem,
+                    preventDefault: function(){},
+                    stopPropagation: function(){},
+                    timeStamp: now()
+                });
+                data[0][expando] = true; // no need to fix fake event
+            }
+
+            // Enforce the right trigger type
+            data[0].type = type;
+            if ( exclusive )
+                data[0].exclusive = true;
+
+            // Trigger the event, it is assumed that "handle" is a function
+            var handle = jQuery.data(elem, "handle");
+            if ( handle )
+                val = handle.apply( elem, data );
+
+            // Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
+            if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
                 val = false;
 
             // Extra functions don't get the custom event object
-            if ( evt )
+            if ( event )
                 data.shift();
 
             // Handle triggering of extra function
-            if ( extra && extra.apply( element, data ) === false )
-                val = false;
+            if ( extra && jQuery.isFunction( extra ) ) {
+                // call the extra function and tack the current return value on the end for possible inspection
+                ret = extra.apply( elem, val == null ? data : data.concat( val ) );
+                // if anything is returned, give it precedence and have it overwrite the previous value
+                if (ret !== undefined)
+                    val = ret;
+            }
 
             // Trigger the native events (except for clicks on links)
-            if ( fn && donative !== false && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
+            if ( fn && donative !== false && val !== false && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
                 this.triggered = true;
-                element[ type ]();
+                try {
+                    elem[ type ]();
+                // prevent IE from throwing an error for some hidden elements
+                } catch (e) {}
             }
 
@@ -1728 +2051 @@
     handle: function(event) {
         // returned undefined or false
-        var val;
-
-        // Empty object is for triggered events with no data
-        event = jQuery.event.fix( event || window.event || {} ); 
+        var val, ret, namespace, all, handlers;
+
+        event = arguments[0] = jQuery.event.fix( event || window.event );
 
         // Namespaced event handlers
-        var parts = event.type.split(".");
-        event.type = parts[0];
-
-        var c = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 );
-        args.unshift( event );
-
-        for ( var j in c ) {
-            // Pass in a reference to the handler function itself
-            // So that we can later remove it
-            args[0].handler = c[j];
-            args[0].data = c[j].data;
+        namespace = event.type.split(".");
+        event.type = namespace[0];
+        namespace = namespace[1];
+        // Cache this now, all = true means, any handler
+        all = !namespace && !event.exclusive;
+
+        handlers = ( jQuery.data(this, "events") || {} )[event.type];
+
+        for ( var j in handlers ) {
+            var handler = handlers[j];
 
             // Filter the functions by class
-            if ( !parts[1] || c[j].type == parts[1] ) {
-                var tmp = c[j].apply( this, args );
+            if ( all || handler.type == namespace ) {
+                // Pass in a reference to the handler function itself
+                // So that we can later remove it
+                event.handler = handler;
+                event.data = handler.data;
+
+                ret = handler.apply( this, arguments );
 
                 if ( val !== false )
-                    val = tmp;
-
-                if ( tmp === false ) {
+                    val = ret;
+
+                if ( ret === false ) {
                     event.preventDefault();
                     event.stopPropagation();
@@ -1760 +2086 @@
         }
 
-        // Clean up added properties in IE to prevent memory leak
-        if (jQuery.browser.msie)
-            event.target = event.preventDefault = event.stopPropagation =
-                event.handler = event.data = null;
-
         return val;
     },
 
     fix: function(event) {
-        // store a copy of the original event object 
-        // and clone to set read-only properties
+        if ( event[expando] == true )
+            return event;
+
+        // store a copy of the original event object
+        // and "clone" to set read-only properties
         var originalEvent = event;
-        event = jQuery.extend({}, originalEvent);
-        
-        // add preventDefault and stopPropagation since 
+        event = { originalEvent: originalEvent };
+        var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");
+        for ( var i=props.length; i; i-- )
+            event[ props[i] ] = originalEvent[ props[i] ];
+
+        // Mark it as fixed
+        event[expando] = true;
+
+        // add preventDefault and stopPropagation since
         // they will not work on the clone
         event.preventDefault = function() {
@@ -1790 +2120 @@
             originalEvent.cancelBubble = true;
         };
-        
+
+        // Fix timeStamp
+        event.timeStamp = event.timeStamp || now();
+
         // Fix target property, if necessary
-        if ( !event.target && event.srcElement )
-            event.target = event.srcElement;
-                
+        if ( !event.target )
+            event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
+
         // check if target is a textnode (safari)
-        if (jQuery.browser.safari && event.target.nodeType == 3)
-            event.target = originalEvent.target.parentNode;
+        if ( event.target.nodeType == 3 )
+            event.target = event.target.parentNode;
 
         // Add relatedTarget, if necessary
@@ -1805 +2138 @@
         // Calculate pageX/Y if missing and clientX/Y available
         if ( event.pageX == null && event.clientX != null ) {
-            var e = document.documentElement, b = document.body;
-            event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft || 0);
-            event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop || 0);
-        }
-            
+            var doc = document.documentElement, body = document.body;
+            event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0);
+            event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0);
+        }
+
         // Add which for key events
-        if ( !event.which && (event.charCode || event.keyCode) )
+        if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) )
             event.which = event.charCode || event.keyCode;
-        
+
         // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
         if ( !event.metaKey && event.ctrlKey )
@@ -1822 +2155 @@
         if ( !event.which && event.button )
             event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-            
+
         return event;
+    },
+
+    proxy: function( fn, proxy ){
+        // Set the guid of unique handler to the same of original handler, so it can be removed
+        proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
+        // So proxy can be declared as an argument
+        return proxy;
+    },
+
+    special: {
+        ready: {
+            setup: function() {
+                // Make sure the ready event is setup
+                bindReady();
+                return;
+            },
+
+            teardown: function() { return; }
+        },
+
+        mouseenter: {
+            setup: function() {
+                if ( jQuery.browser.msie ) return false;
+                jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler);
+                return true;
+            },
+
+            teardown: function() {
+                if ( jQuery.browser.msie ) return false;
+                jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler);
+                return true;
+            },
+
+            handler: function(event) {
+                // If we actually just moused on to a sub-element, ignore it
+                if ( withinElement(event, this) ) return true;
+                // Execute the right handlers by setting the event type to mouseenter
+                event.type = "mouseenter";
+                return jQuery.event.handle.apply(this, arguments);
+            }
+        },
+
+        mouseleave: {
+            setup: function() {
+                if ( jQuery.browser.msie ) return false;
+                jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler);
+                return true;
+            },
+
+            teardown: function() {
+                if ( jQuery.browser.msie ) return false;
+                jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler);
+                return true;
+            },
+
+            handler: function(event) {
+                // If we actually just moused on to a sub-element, ignore it
+                if ( withinElement(event, this) ) return true;
+                // Execute the right handlers by setting the event type to mouseleave
+                event.type = "mouseleave";
+                return jQuery.event.handle.apply(this, arguments);
+            }
+        }
     }
 };
@@ -1833 +2229 @@
         });
     },
-    
+
     one: function( type, data, fn ) {
+        var one = jQuery.event.proxy( fn || data, function(event) {
+            jQuery(this).unbind(event, one);
+            return (fn || data).apply( this, arguments );
+        });
         return this.each(function(){
-            jQuery.event.add( this, type, function(event) {
-                jQuery(this).unbind(event);
-                return (fn || data).apply( this, arguments);
-            }, fn && data);
+            jQuery.event.add( this, type, one, fn && data);
         });
     },
@@ -1856 +2253 @@
 
     triggerHandler: function( type, data, fn ) {
-        if ( this[0] )
-            return jQuery.event.trigger( type, data, this[0], false, fn );
-    },
-
-    toggle: function() {
+        return this[0] && jQuery.event.trigger( type, data, this[0], false, fn );
+    },
+
+    toggle: function( fn ) {
         // Save reference to arguments for access in closure
-        var a = arguments;
-
-        return this.click(function(e) {
+        var args = arguments, i = 1;
+
+        // link all the functions, so any of them can unbind this click handler
+        while( i < args.length )
+            jQuery.event.proxy( fn, args[i++] );
+
+        return this.click( jQuery.event.proxy( fn, function(event) {
             // Figure out which function to execute
-            this.lastToggle = 0 == this.lastToggle ? 1 : 0;
-            
+            this.lastToggle = ( this.lastToggle || 0 ) % i;
+
             // Make sure that clicks stop
-            e.preventDefault();
-            
+            event.preventDefault();
+
             // and execute the function
-            return a[this.lastToggle].apply( this, [e] ) || false;
-        });
-    },
-
-    hover: function(f,g) {
-        
-        // A private function for handling mouse 'hovering'
-        function handleHover(e) {
-            // Check if mouse(over|out) are still within the same parent element
-            var p = e.relatedTarget;
-    
-            // Traverse up the tree
-            while ( p && p != this ) try { p = p.parentNode; } catch(e) { p = this; };
-            
-            // If we actually just moused on to a sub-element, ignore it
-            if ( p == this ) return false;
-            
-            // Execute the right function
-            return (e.type == "mouseover" ? f : g).apply(this, [e]);
-        }
-        
-        // Bind the function to the two event listeners
-        return this.mouseover(handleHover).mouseout(handleHover);
-    },
-    
-    ready: function(f) {
+            return args[ this.lastToggle++ ].apply( this, arguments ) || false;
+        }));
+    },
+
+    hover: function(fnOver, fnOut) {
+        return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut);
+    },
+
+    ready: function(fn) {
         // Attach the listeners
         bindReady();
@@ -1904 +2287 @@
         if ( jQuery.isReady )
             // Execute the function immediately
-            f.apply( document, [jQuery] );
-            
+            fn.call( document, jQuery );
+
         // Otherwise, remember the function for later
         else
             // Add the function to the wait list
-            jQuery.readyList.push( function() { return f.apply(this, [jQuery]); } );
-    
+            jQuery.readyList.push( function() { return fn.call(this, jQuery); } );
+
         return this;
     }
@@ -1916 +2299 @@
 
 jQuery.extend({
-    /*
-     * All the code that makes DOM Ready work nicely.
-     */
     isReady: false,
     readyList: [],
-    
     // Handle when the DOM is ready
     ready: function() {
@@ -1928 +2307 @@
             // Remember that the DOM is ready
             jQuery.isReady = true;
-            
+
             // If there are functions bound, to execute
             if ( jQuery.readyList ) {
                 // Execute all of them
                 jQuery.each( jQuery.readyList, function(){
-                    this.apply( document );
+                    this.call( document );
                 });
-                
+
                 // Reset the list of functions
                 jQuery.readyList = null;
             }
-            // Remove event listener to avoid memory leak
-            if ( jQuery.browser.mozilla || jQuery.browser.opera )
-                document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
-            
-            // Remove script element used by IE hack
-            if( !window.frames.length ) // don't remove if frames are present (#1187)
-                jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
+
+            // Trigger any bound ready events
+            jQuery(document).triggerHandler("ready");
         }
     }
-});
-
-jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
-    "mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + 
-    "submit,keydown,keypress,keyup,error").split(","), function(i,o){
-    
-    // Handle event binding
-    jQuery.fn[o] = function(f){
-        return f ? this.bind(o, f) : this.trigger(o);
-    };
 });
 
@@ -1966 +2331 @@
     readyBound = true;
 
-    // If Mozilla is used
-    if ( jQuery.browser.mozilla || jQuery.browser.opera )
+    // Mozilla, Opera (see further below for it) and webkit nightlies currently support this event
+    if ( document.addEventListener && !jQuery.browser.opera)
         // Use the handy event callback
         document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
-    
-    // If IE is used, use the excellent hack by Matthias Miller
-    // http://www.outofhanwell.com/blog/index.php?title=the_window_onload_problem_revisited
-    else if ( jQuery.browser.msie ) {
-    
-        // Only works if you document.write() it
-        document.write("<scr" + "ipt id=__ie_init defer=true " + 
-            "src=//:><\/script>");
-    
-        // Use the defer script hack
-        var script = document.getElementById("__ie_init");
-        
-        // script does not exist if jQuery is loaded dynamically
-        if ( script ) 
-            script.onreadystatechange = function() {
-                if ( this.readyState != "complete" ) return;
-                jQuery.ready();
-            };
-    
-        // Clear from memory
-        script = null;
-    
-    // If Safari  is used
-    } else if ( jQuery.browser.safari )
-        // Continually check to see if the document.readyState is valid
-        jQuery.safariTimer = setInterval(function(){
-            // loaded and complete are both valid states
-            if ( document.readyState == "loaded" || 
-                document.readyState == "complete" ) {
-    
-                // If either one are found, remove the timer
-                clearInterval( jQuery.safariTimer );
-                jQuery.safariTimer = null;
-    
-                // and execute any waiting functions
-                jQuery.ready();
-            }
-        }, 10); 
+
+    // If IE is used and is not in a frame
+    // Continually check to see if the document is ready
+    if ( jQuery.browser.msie && window == top ) (function(){
+        if (jQuery.isReady) return;
+        try {
+            // If IE is used, use the trick by Diego Perini
+            // http://javascript.nwbox.com/IEContentLoaded/
+            document.documentElement.doScroll("left");
+        } catch( error ) {
+            setTimeout( arguments.callee, 0 );
+            return;
+        }
+        // and execute any waiting functions
+        jQuery.ready();
+    })();
+
+    if ( jQuery.browser.opera )
+        document.addEventListener( "DOMContentLoaded", function () {
+            if (jQuery.isReady) return;
+            for (var i = 0; i < document.styleSheets.length; i++)
+                if (document.styleSheets[i].disabled) {
+                    setTimeout( arguments.callee, 0 );
+                    return;
+                }
+            // and execute any waiting functions
+            jQuery.ready();
+        }, false);
+
+    if ( jQuery.browser.safari ) {
+        var numStyles;
+        (function(){
+            if (jQuery.isReady) return;
+            if ( document.readyState != "loaded" && document.readyState != "complete" ) {
+                setTimeout( arguments.callee, 0 );
+                return;
+            }
+            if ( numStyles === undefined )
+                numStyles = jQuery("style, link[rel=stylesheet]").length;
+            if ( document.styleSheets.length != numStyles ) {
+                setTimeout( arguments.callee, 0 );
+                return;
+            }
+            // and execute any waiting functions
+            jQuery.ready();
+        })();
+    }
 
     // A fallback to window.onload, that will always work
     jQuery.event.add( window, "load", jQuery.ready );
 }
+
+jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
+    "mousedown,mouseup,mousemove,mouseover,mouseout,change,select," +
+    "submit,keydown,keypress,keyup,error").split(","), function(i, name){
+
+    // Handle event binding
+    jQuery.fn[name] = function(fn){
+        return fn ? this.bind(name, fn) : this.trigger(name);
+    };
+});
+
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function(event, elem) {
+    // Check if mouse(over|out) are still within the same parent element
+    var parent = event.relatedTarget;
+    // Traverse up the tree
+    while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; }
+    // Return true if we actually just moused on to a sub-element
+    return parent == elem;
+};
+
+// Prevent memory leaks in IE
+// And prevent errors on refresh with events like mouseover in other browsers
+// Window isn't included so as not to unbind existing unload events
+jQuery(window).bind("unload", function() {
+    jQuery("*").add(document).unbind();
+});
 jQuery.fn.extend({
+    // Keep a copy of the old load
+    _load: jQuery.fn.load,
+
     load: function( url, params, callback ) {
-        if ( jQuery.isFunction( url ) )
-            return this.bind("load", url);
+        if ( typeof url != 'string' )
+            return this._load( url );
 
         var off = url.indexOf(" ");
@@ -2048 +2453 @@
             url: url,
             type: type,
+            dataType: "html",
             data: params,
             complete: function(res, status){
@@ -2066 +2472 @@
                         res.responseText );
 
-                // Add delay to account for Safari's delay in globalEval
-                setTimeout(function(){
-                    self.each( callback, [res.responseText, status, res] );
-                }, 13);
+                self.each( callback, [res.responseText, status, res] );
             }
         });
@@ -2084 +2487 @@
         })
         .filter(function(){
-            return this.name && !this.disabled && 
-                (this.checked || /select|textarea/i.test(this.nodeName) || 
+            return this.name && !this.disabled &&
+                (this.checked || /select|textarea/i.test(this.nodeName) ||
                     /text|hidden|password/i.test(this.type));
         })
@@ -2092 +2495 @@
             return val == null ? null :
                 val.constructor == Array ?
-                    jQuery.map( val, function(i, val){
+                    jQuery.map( val, function(val, i){
                         return {name: elem.name, value: val};
                     }) :
@@ -2107 +2510 @@
 });
 
-var jsc = (new Date).getTime();
+var jsc = now();
 
 jQuery.extend({
@@ -2116 +2519 @@
             data = null;
         }
-        
+
         return jQuery.ajax({
             type: "GET",
@@ -2154 +2557 @@
 
     ajaxSettings: {
+        url: location.href,
         global: true,
         type: "GET",
@@ -2160 +2564 @@
         processData: true,
         async: true,
-        data: null
-    },
-    
+        data: null,
+        username: null,
+        password: null,
+        accepts: {
+            xml: "application/xml, text/xml",
+            html: "text/html",
+            script: "text/javascript, application/javascript",
+            json: "application/json, text/javascript",
+            text: "text/plain",
+            _default: "*/*"
+        }
+    },
+
     // Last-Modified header cache for next request
     lastModified: {},
 
     ajax: function( s ) {
-        var jsonp, jsre = /=(\?|%3F)/g, status, data;
-
         // Extend the settings, but re-extend 's' so that it can be
         // checked again later (in the test suite, specifically)
         s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
 
+        var jsonp, jsre = /=\?(&|$)/g, status, data,
+            type = s.type.toUpperCase();
+
         // convert data if not already a string
         if ( s.data && s.processData && typeof s.data != "string" )
             s.data = jQuery.param(s.data);
 
-        // Break the data into one single string
-        var q = s.url.indexOf("?");
-        if ( q > -1 ) {
-            s.data = (s.data ? s.data + "&" : "") + s.url.slice(q + 1);
-            s.url = s.url.slice(0, q);
-        }
-
         // Handle JSONP Parameter Callbacks
         if ( s.dataType == "jsonp" ) {
-            if ( !s.data || !s.data.match(jsre) )
+            if ( type == "GET" ) {
+                if ( !s.url.match(jsre) )
+                    s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+            } else if ( !s.data || !s.data.match(jsre) )
                 s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
             s.dataType = "json";
@@ -2192 +2603 @@
 
         // Build temporary JSONP function
-        if ( s.dataType == "json" && s.data && s.data.match(jsre) ) {
+        if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) {
             jsonp = "jsonp" + jsc++;
-            s.data = s.data.replace(jsre, "=" + jsonp);
+
+            // Replace the =? sequence both in the query string and the data
+            if ( s.data )
+                s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+            s.url = s.url.replace(jsre, "=" + jsonp + "$1");
 
             // We need to make sure
@@ -2204 +2619 @@
                 data = tmp;
                 success();
+                complete();
                 // Garbage collect
                 window[ jsonp ] = undefined;
                 try{ delete window[ jsonp ]; } catch(e){}
+                if ( head )
+                    head.removeChild( script );
             };
         }
@@ -2213 +2631 @@
             s.cache = false;
 
-        if ( s.cache === false && s.type.toLowerCase() == "get" )
-            s.data = (s.data ? s.data + "&" : "") + "_=" + (new Date()).getTime();
+        if ( s.cache === false && type == "GET" ) {
+            var ts = now();
+            // try replacing _= if it is there
+            var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
+            // if nothing was replaced, add timestamp to the end
+            s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
+        }
 
         // If data is available, append data to url for get requests
-        if ( s.data && s.type.toLowerCase() == "get" ) {
-            s.url += "?" + s.data;
+        if ( s.data && type == "GET" ) {
+            s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
 
             // IE likes to send both get and post data, prevent this
@@ -2228 +2651 @@
             jQuery.event.trigger( "ajaxStart" );
 
+        // Matches an absolute URL, and saves the domain
+        var remote = /^(?:\w+:)?\/\/([^\/?#]+)/;
+
         // If we're requesting a remote document
-        // and trying to load JSON or Script
-        if ( !s.url.indexOf("http") && s.dataType == "script" ) {
+        // and trying to load JSON or Script with a GET
+        if ( s.dataType == "script" && type == "GET"
+                && remote.test(s.url) && remote.exec(s.url)[1] != location.host ){
             var head = document.getElementsByTagName("head")[0];
             var script = document.createElement("script");
             script.src = s.url;
+            if (s.scriptCharset)
+                script.charset = s.scriptCharset;
 
             // Handle Script loading
-            if ( !jsonp && (s.success || s.complete) ) {
+            if ( !jsonp ) {
                 var done = false;
 
                 // Attach handlers for all browsers
                 script.onload = script.onreadystatechange = function(){
-                    if ( !done && (!this.readyState || 
+                    if ( !done && (!this.readyState ||
                             this.readyState == "loaded" || this.readyState == "complete") ) {
                         done = true;
@@ -2254 +2683 @@
 
             // We handle everything using the script element injection
-            return;
+            return undefined;
         }
 
@@ -2261 +2690 @@
         // Create the request object; Microsoft failed to properly
         // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
-        var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+        var xhr = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
 
         // Open the socket
-        xml.open(s.type, s.url, s.async);
-
-        // Set the correct header, if data is being sent
-        if ( s.data )
-            xml.setRequestHeader("Content-Type", s.contentType);
-
-        // Set the If-Modified-Since header, if ifModified mode.
-        if ( s.ifModified )
-            xml.setRequestHeader("If-Modified-Since",
-                jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
-
-        // Set header so the called script knows that it's an XMLHttpRequest
-        xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+        // Passing null username, generates a login popup on Opera (#2865)
+        if( s.username )
+            xhr.open(type, s.url, s.async, s.username, s.password);
+        else
+            xhr.open(type, s.url, s.async);
+
+        // Need an extra try/catch for cross domain requests in Firefox 3
+        try {
+            // Set the correct header, if data is being sent
+            if ( s.data )
+                xhr.setRequestHeader("Content-Type", s.contentType);
+
+            // Set the If-Modified-Since header, if ifModified mode.
+            if ( s.ifModified )
+                xhr.setRequestHeader("If-Modified-Since",
+                    jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
+
+            // Set header so the called script knows that it's an XMLHttpRequest
+            xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+            // Set the Accepts header for the server, depending on the dataType
+            xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+                s.accepts[ s.dataType ] + ", */*" :
+                s.accepts._default );
+        } catch(e){}
 
         // Allow custom headers/mimetypes
-        if ( s.beforeSend )
-            s.beforeSend(xml);
-            
+        if ( s.beforeSend && s.beforeSend(xhr, s) === false ) {
+            // cleanup active request counter
+            s.global && jQuery.active--;
+            // close opended socket
+            xhr.abort();
+            return false;
+        }
+
         if ( s.global )
-            jQuery.event.trigger("ajaxSend", [xml, s]);
+            jQuery.event.trigger("ajaxSend", [xhr, s]);
 
         // Wait for a response to come back
         var onreadystatechange = function(isTimeout){
             // The transfer is complete and the data is available, or the request timed out
-            if ( !requestDone && xml && (xml.readyState == 4 || isTimeout == "timeout") ) {
+            if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) {
                 requestDone = true;
-                
+
                 // clear poll interval
                 if (ival) {
@@ -2296 +2742 @@
                     ival = null;
                 }
-                
+
                 status = isTimeout == "timeout" && "timeout" ||
-                    !jQuery.httpSuccess( xml ) && "error" ||
-                    s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
+                    !jQuery.httpSuccess( xhr ) && "error" ||
+                    s.ifModified && jQuery.httpNotModified( xhr, s.url ) && "notmodified" ||
                     "success";
 
@@ -2306 +2752 @@
                     try {
                         // process the data (runs the xml through httpData regardless of callback)
-                        data = jQuery.httpData( xml, s.dataType );
+                        data = jQuery.httpData( xhr, s.dataType, s.dataFilter );
                     } catch(e) {
                         status = "parsererror";
@@ -2317 +2763 @@
                     var modRes;
                     try {
-                        modRes = xml.getResponseHeader("Last-Modified");
+                        modRes = xhr.getResponseHeader("Last-Modified");
                     } catch(e) {} // swallow exception thrown by FF if header is not available
-    
+
                     if ( s.ifModified && modRes )
                         jQuery.lastModified[s.url] = modRes;
@@ -2325 +2771 @@
                     // JSONP handles its own success callback
                     if ( !jsonp )
-                        success();  
+                        success();
                 } else
-                    jQuery.handleError(s, xml, status);
+                    jQuery.handleError(s, xhr, status);
 
                 // Fire the complete handlers
@@ -2334 +2780 @@
                 // Stop memory leaks
                 if ( s.async )
-                    xml = null;
+                    xhr = null;
             }
         };
-        
+
         if ( s.async ) {
             // don't attach the handler to the request, just poll it instead
-            var ival = setInterval(onreadystatechange, 13); 
+            var ival = setInterval(onreadystatechange, 13);
 
             // Timeout checker
@@ -2346 +2792 @@
                 setTimeout(function(){
                     // Check to see if the request is still happening
-                    if ( xml ) {
+                    if ( xhr ) {
                         // Cancel the request
-                        xml.abort();
-    
+                        xhr.abort();
+
                         if( !requestDone )
                             onreadystatechange( "timeout" );
@@ -2355 +2801 @@
                 }, s.timeout);
         }
-            
+
         // Send the data
         try {
-            xml.send(s.data);
+            xhr.send(s.data);
         } catch(e) {
-            jQuery.handleError(s, xml, null, e);
-        }
-        
+            jQuery.handleError(s, xhr, null, e);
+        }
+
         // firefox 1.5 doesn't fire statechange for sync requests
         if ( !s.async )
             onreadystatechange();
-        
-        // return XMLHttpRequest to allow aborting the request etc.
-        return xml;
 
         function success(){
@@ -2377 +2820 @@
             // Fire the global callback
             if ( s.global )
-                jQuery.event.trigger( "ajaxSuccess", [xml, s] );
+                jQuery.event.trigger( "ajaxSuccess", [xhr, s] );
         }
 
@@ -2383 +2826 @@
             // Process result
             if ( s.complete )
-                s.complete(xml, status);
+                s.complete(xhr, status);
 
             // The request was completed
             if ( s.global )
-                jQuery.event.trigger( "ajaxComplete", [xml, s] );
+                jQuery.event.trigger( "ajaxComplete", [xhr, s] );
 
             // Handle the global AJAX counter
@@ -2393 +2836 @@
                 jQuery.event.trigger( "ajaxStop" );
         }
-    },
-
-    handleError: function( s, xml, status, e ) {
+
+        // return XMLHttpRequest to allow aborting the request etc.
+        return xhr;
+    },
+
+    handleError: function( s, xhr, status, e ) {
         // If a local callback was specified, fire it
-        if ( s.error ) s.error( xml, status, e );
+        if ( s.error ) s.error( xhr, status, e );
 
         // Fire the global callback
         if ( s.global )
-            jQuery.event.trigger( "ajaxError", [xml, s, e] );
+            jQuery.event.trigger( "ajaxError", [xhr, s, e] );
     },
 
@@ -2408 +2854 @@
 
     // Determines if an XMLHttpRequest was successful or not
-    httpSuccess: function( r ) {
+    httpSuccess: function( xhr ) {
         try {
-            return !r.status && location.protocol == "file:" ||
-                ( r.status >= 200 && r.status < 300 ) || r.status == 304 ||
-                jQuery.browser.safari && r.status == undefined;
+            // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
+            return !xhr.status && location.protocol == "file:" ||
+                ( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223 ||
+                jQuery.browser.safari && xhr.status == undefined;
         } catch(e){}
         return false;
@@ -2418 +2865 @@
 
     // Determines if an XMLHttpRequest returns NotModified
-    httpNotModified: function( xml, url ) {
+    httpNotModified: function( xhr, url ) {
         try {
-            var xmlRes = xml.getResponseHeader("Last-Modified");
+            var xhrRes = xhr.getResponseHeader("Last-Modified");
 
             // Firefox always returns 200. check Last-Modified date
-            return xml.status == 304 || xmlRes == jQuery.lastModified[url] ||
-                jQuery.browser.safari && xml.status == undefined;
+            return xhr.status == 304 || xhrRes == jQuery.lastModified[url] ||
+                jQuery.browser.safari && xhr.status == undefined;
         } catch(e){}
         return false;
     },
 
-    httpData: function( r, type ) {
-        var ct = r.getResponseHeader("content-type");
-        var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0;
-        var data = xml ? r.responseXML : r.responseText;
+    httpData: function( xhr, type, filter ) {
+        var ct = xhr.getResponseHeader("content-type"),
+            xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0,
+            data = xml ? xhr.responseXML : xhr.responseText;
 
         if ( xml && data.documentElement.tagName == "parsererror" )
             throw "parsererror";
+            
+        // Allow a pre-filtering function to sanitize the response
+        if( filter )
+            data = filter( data, type );
 
         // If the type is "script", eval it in global context
@@ -2471 +2922 @@
                     });
                 else
-                    s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) );
+                    s.push( encodeURIComponent(j) + "=" + encodeURIComponent( jQuery.isFunction(a[j]) ? a[j]() : a[j] ) );
 
         // Return the resulting serialization
@@ -2484 +2935 @@
                 height: "show", width: "show", opacity: "show"
             }, speed, callback) :
-            
+
             this.filter(":hidden").each(function(){
-                this.style.display = this.oldblock ? this.oldblock : "";
-                if ( jQuery.css(this,"display") == "none" )
-                    this.style.display = "block";
+                this.style.display = this.oldblock || "";
+                if ( jQuery.css(this,"display") == "none" ) {
+                    var elem = jQuery("<" + this.tagName + " />").appendTo("body");
+                    this.style.display = elem.css("display");
+                    // handle an edge condition where css is - div { display:none; } or similar
+                    if (this.style.display == "none")
+                        this.style.display = "block";
+                    elem.remove();
+                }
             }).end();
     },
-    
+
     hide: function(speed,callback){
         return speed ?
@@ -2497 +2954 @@
                 height: "hide", width: "hide", opacity: "hide"
             }, speed, callback) :
-            
+
             this.filter(":visible").each(function(){
                 this.oldblock = this.oldblock || jQuery.css(this,"display");
-                if ( this.oldblock == "none" )
-                    this.oldblock = "block";
                 this.style.display = "none";
             }).end();
@@ -2508 +2963 @@
     // Save the old toggle function
     _toggle: jQuery.fn.toggle,
-    
+
     toggle: function( fn, fn2 ){
         return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
-            this._toggle( fn, fn2 ) :
+            this._toggle.apply( this, arguments ) :
             fn ?
                 this.animate({
@@ -2520 +2975 @@
                 });
     },
-    
+
     slideDown: function(speed,callback){
         return this.animate({height: "show"}, speed, callback);
     },
-    
+
     slideUp: function(speed,callback){
         return this.animate({height: "hide"}, speed, callback);
@@ -2532 +2987 @@
         return this.animate({height: "toggle"}, speed, callback);
     },
-    
+
     fadeIn: function(speed, callback){
         return this.animate({opacity: "show"}, speed, callback);
     },
-    
+
     fadeOut: function(speed, callback){
         return this.animate({opacity: "hide"}, speed, callback);
     },
-    
+
     fadeTo: function(speed,to,callback){
         return this.animate({opacity: to}, speed, callback);
     },
-    
+
     animate: function( prop, speed, easing, callback ) {
-        var opt = jQuery.speed(speed, easing, callback);
-
-        return this[ opt.queue === false ? "each" : "queue" ](function(){
-            opt = jQuery.extend({}, opt);
-            var hidden = jQuery(this).is(":hidden"), self = this;
-            
-            for ( var p in prop ) {
+        var optall = jQuery.speed(speed, easing, callback);
+
+        return this[ optall.queue === false ? "each" : "queue" ](function(){
+            if ( this.nodeType != 1)
+                return false;
+
+            var opt = jQuery.extend({}, optall), p,
+                hidden = jQuery(this).is(":hidden"), self = this;
+
+            for ( p in prop ) {
                 if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
-                    return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
+                    return opt.complete.call(this);
 
                 if ( p == "height" || p == "width" ) {
@@ -2569 +3027 @@
 
             opt.curAnim = jQuery.extend({}, prop);
-            
+
             jQuery.each( prop, function(name, val){
                 var e = new jQuery.fx( self, opt, name );
@@ -2576 +3034 @@
                     e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
                 else {
-                    var parts = val.toString().match(/^([+-]?)([\d.]+)(.*)$/),
+                    var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
                         start = e.cur(true) || 0;
 
                     if ( parts ) {
-                        end = parseFloat(parts[2]),
-                        unit = parts[3] || "px";
+                        var end = parseFloat(parts[2]),
+                            unit = parts[3] || "px";
 
                         // We need to compute starting value
                         if ( unit != "px" ) {
-                            self.style[ name ] = end + unit;
-                            start = (end / e.cur(true)) * start;
+                            self.style[ name ] = (end || 1) + unit;
+                            start = ((end || 1) / e.cur(true)) * start;
                             self.style[ name ] = start + unit;
                         }
 
-                        // If a +/- token was provided, we're doing a relative animation
+                        // If a +=/-= token was provided, we're doing a relative animation
                         if ( parts[1] )
-                            end = ((parts[1] == "-" ? -1 : 1) * end) + start;
+                            end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
 
                         e.custom( start, end, unit );
@@ -2604 +3062 @@
         });
     },
-    
+
     queue: function(type, fn){
-        if ( !fn ) {
+        if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
             fn = type;
             type = "fx";
         }
 
-        if ( !arguments.length )
+        if ( !type || (typeof type == "string" && !fn) )
             return queue( this[0], type );
 
@@ -2619 +3077 @@
             else {
                 queue(this, type).push( fn );
-            
+
                 if ( queue(this, type).length == 1 )
-                    fn.apply(this);
+                    fn.call(this);
             }
         });
     },
 
-    stop: function(){
+    stop: function(clearQueue, gotoEnd){
         var timers = jQuery.timers;
 
-        return this.each(function(){
-            for ( var i = 0; i < timers.length; i++ )
-                if ( timers[i].elem == this )
-                    timers.splice(i--, 1);
-        }).dequeue();
+        if (clearQueue)
+            this.queue([]);
+
+        this.each(function(){
+            // go in reverse order so anything added to the queue during the loop is ignored
+            for ( var i = timers.length - 1; i >= 0; i-- )
+                if ( timers[i].elem == this ) {
+                    if (gotoEnd)
+                        // force the next step to be the last
+                        timers[i](true);
+                    timers.splice(i, 1);
+                }
+        });
+
+        // start the next in the queue if the last step wasn't forced
+        if (!gotoEnd)
+            this.dequeue();
+
+        return this;
     }
 
@@ -2639 +3111 @@
 
 var queue = function( elem, type, array ) {
-    if ( !elem )
-        return;
-
-    var q = jQuery.data( elem, type + "queue" );
-
-    if ( !q || array )
-        q = jQuery.data( elem, type + "queue", 
-            array ? jQuery.makeArray(array) : [] );
-
+    if ( elem ){
+
+        type = type || "fx";
+
+        var q = jQuery.data( elem, type + "queue" );
+
+        if ( !q || array )
+            q = jQuery.data( elem, type + "queue", jQuery.makeArray(array) );
+
+    }
     return q;
 };
@@ -2660 +3133 @@
 
         if ( q.length )
-            q[0].apply( this );
+            q[0].call( this );
     });
 };
 
 jQuery.extend({
-    
+
     speed: function(speed, easing, fn) {
         var opt = speed && speed.constructor == Object ? speed : {
-            complete: fn || !fn && easing || 
+            complete: fn || !fn && easing ||
                 jQuery.isFunction( speed ) && speed,
             duration: speed,
@@ -2674 +3147 @@
         };
 
-        opt.duration = (opt.duration && opt.duration.constructor == Number ? 
-            opt.duration : 
-            { slow: 600, fast: 200 }[opt.duration]) || 400;
-    
+        opt.duration = (opt.duration && opt.duration.constructor == Number ?
+            opt.duration :
+            jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds.def;
+
         // Queueing
         opt.old = opt.complete;
         opt.complete = function(){
-            jQuery(this).dequeue();
+            if ( opt.queue !== false )
+                jQuery(this).dequeue();
             if ( jQuery.isFunction( opt.old ) )
-                opt.old.apply( this );
+                opt.old.call( this );
         };
-    
+
         return opt;
     },
-    
+
     easing: {
         linear: function( p, n, firstNum, diff ) {
@@ -2697 +3171 @@
         }
     },
-    
+
     timers: [],
+    timerId: null,
 
     fx: function( elem, options, prop ){
@@ -2716 +3191 @@
     update: function(){
         if ( this.options.step )
-            this.options.step.apply( this.elem, [ this.now, this ] );
+            this.options.step.call( this.elem, this.now, this );
 
         (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
@@ -2730 +3205 @@
             return this.elem[ this.prop ];
 
-        var r = parseFloat(jQuery.curCSS(this.elem, this.prop, force));
-        return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
+        var r = parseFloat(jQuery.css(this.elem, this.prop, force));
+        return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
     },
 
     // Start an animation from one number to another
     custom: function(from, to, unit){
-        this.startTime = (new Date()).getTime();
+        this.startTime = now();
         this.start = from;
         this.end = to;
@@ -2745 +3220 @@
 
         var self = this;
-        function t(){
-            return self.step();
+        function t(gotoEnd){
+            return self.step(gotoEnd);
         }
 
@@ -2753 +3228 @@
         jQuery.timers.push(t);
 
-        if ( jQuery.timers.length == 1 ) {
-            var timer = setInterval(function(){
+        if ( jQuery.timerId == null ) {
+            jQuery.timerId = setInterval(function(){
                 var timers = jQuery.timers;
-                
+
                 for ( var i = 0; i < timers.length; i++ )
                     if ( !timers[i]() )
                         timers.splice(i--, 1);
 
-                if ( !timers.length )
-                    clearInterval( timer );
+                if ( !timers.length ) {
+                    clearInterval( jQuery.timerId );
+                    jQuery.timerId = null;
+                }
             }, 13);
         }
@@ -2780 +3257 @@
         if ( this.prop == "width" || this.prop == "height" )
             this.elem.style[this.prop] = "1px";
-        
+
         // Start by showing the element
         jQuery(this.elem).show();
@@ -2796 +3273 @@
 
     // Each step of an animation
-    step: function(){
-        var t = (new Date()).getTime();
-
-        if ( t > this.options.duration + this.startTime ) {
+    step: function(gotoEnd){
+        var t = now();
+
+        if ( gotoEnd || t > this.options.duration + this.startTime ) {
             this.now = this.end;
             this.pos = this.state = 1;
@@ -2815 +3292 @@
                     // Reset the overflow
                     this.elem.style.overflow = this.options.overflow;
-                
+
                     // Reset the display
                     this.elem.style.display = this.options.display;
@@ -2832 +3309 @@
             }
 
-            // If a callback was provided, execute it
-            if ( done && jQuery.isFunction( this.options.complete ) )
+            if ( done )
                 // Execute the complete function
-                this.options.complete.apply( this.elem );
+                this.options.complete.call( this.elem );
 
             return false;
@@ -2855 +3331 @@
 };
 
-jQuery.fx.step = {
-    scrollLeft: function(fx){
-        fx.elem.scrollLeft = fx.now;
-    },
-
-    scrollTop: function(fx){
-        fx.elem.scrollTop = fx.now;
-    },
-
-    opacity: function(fx){
-        jQuery.attr(fx.elem.style, "opacity", fx.now);
-    },
-
-    _default: function(fx){
-        fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+jQuery.extend( jQuery.fx, {
+    speeds:{
+        slow: 600,
+        fast: 200,
+        // Default speed
+        def: 400
+    },
+    step: {
+        scrollLeft: function(fx){
+            fx.elem.scrollLeft = fx.now;
+        },
+
+        scrollTop: function(fx){
+            fx.elem.scrollTop = fx.now;
+        },
+
+        opacity: function(fx){
+            jQuery.attr(fx.elem.style, "opacity", fx.now);
+        },
+
+        _default: function(fx){
+            fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+        }
     }
-};
+});
 // The Offset Method
 // Originally By Brandon Aaron, part of the Dimension Plugin
@@ -2877 +3361 @@
 jQuery.fn.offset = function() {
     var left = 0, top = 0, elem = this[0], results;
-    
+
     if ( elem ) with ( jQuery.browser ) {
-        var absolute    = jQuery.css(elem, "position") == "absolute", 
-                parent      = elem.parentNode, 
-                offsetParent    = elem.offsetParent, 
-                doc     = elem.ownerDocument,
-            safari2     = safari && !absolute && parseInt(version) < 522;
-    
+        var parent       = elem.parentNode,
+            offsetChild  = elem,
+            offsetParent = elem.offsetParent,
+            doc          = elem.ownerDocument,
+            safari2      = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
+            css          = jQuery.curCSS,
+            fixed        = css(elem, "position") == "fixed";
+
         // Use getBoundingClientRect if available
         if ( elem.getBoundingClientRect ) {
-            box = elem.getBoundingClientRect();
-        
+            var box = elem.getBoundingClientRect();
+
             // Add the document scroll offsets
-            add(
-                box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-                box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop)
-            );
-        
+            add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
+                box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
+
             // IE adds the HTML element's border, by default it is medium which is 2px
-            // IE 6 and IE 7 quirks mode the border width is overwritable by the following css html { border: 0; }
+            // IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; }
             // IE 7 standards mode, the border is always 2px
-            if ( msie ) {
-                var border = jQuery("html").css("borderWidth");
-                border = (border == "medium" || jQuery.boxModel && parseInt(version) >= 7) && 2 || border;
-                add( -border, -border );
-            }
-    
+            // This border/offset is typically represented by the clientLeft and clientTop properties
+            // However, in IE6 and 7 quirks mode the clientLeft and clientTop properties are not updated when overwriting it via CSS
+            // Therefore this method will be off by 2px in IE while in quirksmode
+            add( -doc.documentElement.clientLeft, -doc.documentElement.clientTop );
+
         // Otherwise loop through the offsetParents and parentNodes
         } else {
-        
+
             // Initial element offsets
             add( elem.offsetLeft, elem.offsetTop );
-        
+
             // Get parent offsets
             while ( offsetParent ) {
                 // Add offsetParent offsets
                 add( offsetParent.offsetLeft, offsetParent.offsetTop );
-            
+
                 // Mozilla and Safari > 2 does not include the border on offset parents
-                // However Mozilla adds the border for table cells
-                if ( mozilla && /^t[d|h]$/i.test(parent.tagName) || !safari2 )
+                // However Mozilla adds the border for table or table cells
+                if ( mozilla && !/^t(able|d|h)$/i.test(offsetParent.tagName) || safari && !safari2 )
                     border( offsetParent );
-                
-                // Safari <= 2 doubles body offsets with an absolutely positioned element or parent
-                if ( safari2 && !absolute && jQuery.css(offsetParent, "position") == "absolute" )
-                    absolute = true;
-            
+
+                // Add the document scroll offsets if position is fixed on any offsetParent
+                if ( !fixed && css(offsetParent, "position") == "fixed" )
+                    fixed = true;
+
+                // Set offsetChild to previous offsetParent unless it is the body element
+                offsetChild  = /^body$/i.test(offsetParent.tagName) ? offsetChild : offsetParent;
                 // Get next offsetParent
                 offsetParent = offsetParent.offsetParent;
             }
-        
+
             // Get parent scroll offsets
-            while ( parent.tagName && /^body|html$/i.test(parent.tagName) ) {
-                // Work around opera inline/table scrollLeft/Top bug
-                if ( /^inline|table-row.*$/i.test(jQuery.css(parent, "display")) )
+            while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
+                // Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
+                if ( !/^inline|table.*$/i.test(css(parent, "display")) )
                     // Subtract parent scroll offsets
                     add( -parent.scrollLeft, -parent.scrollTop );
-            
+
                 // Mozilla does not add the border for a parent that has overflow != visible
-                if ( mozilla && jQuery.css(parent, "overflow") != "visible" )
+                if ( mozilla && css(parent, "overflow") != "visible" )
                     border( parent );
-            
+
                 // Get next parent
                 parent = parent.parentNode;
             }
-        
-            // Safari doubles body offsets with an absolutely positioned element or parent
-            if ( safari && absolute )
-                add( -doc.body.offsetLeft, -doc.body.offsetTop );
+
+            // Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild
+            // Mozilla doubles body offsets with a non-absolutely positioned offsetChild
+            if ( (safari2 && (fixed || css(offsetChild, "position") == "absolute")) ||
+                (mozilla && css(offsetChild, "position") != "absolute") )
+                    add( -doc.body.offsetLeft, -doc.body.offsetTop );
+
+            // Add the document scroll offsets if position is fixed
+            if ( fixed )
+                add(Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
+                    Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
         }
 
@@ -2952 +3444 @@
     }
 
+    function border(elem) {
+        add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) );
+    }
+
+    function add(l, t) {
+        left += parseInt(l, 10) || 0;
+        top += parseInt(t, 10) || 0;
+    }
+
     return results;
-
-    function border(elem) {
-        add( jQuery.css(elem, "borderLeftWidth"), jQuery.css(elem, "borderTopWidth") );
+};
+
+
+jQuery.fn.extend({
+    position: function() {
+        var left = 0, top = 0, results;
+
+        if ( this[0] ) {
+            // Get *real* offsetParent
+            var offsetParent = this.offsetParent(),
+
+            // Get correct offsets
+            offset       = this.offset(),
+            parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+            // Subtract element margins
+            // note: when an element has margin: auto the offsetLeft and marginLeft 
+            // are the same in Safari causing offset.left to incorrectly be 0
+            offset.top  -= num( this, 'marginTop' );
+            offset.left -= num( this, 'marginLeft' );
+
+            // Add offsetParent borders
+            parentOffset.top  += num( offsetParent, 'borderTopWidth' );
+            parentOffset.left += num( offsetParent, 'borderLeftWidth' );
+
+            // Subtract the two offsets
+            results = {
+                top:  offset.top  - parentOffset.top,
+                left: offset.left - parentOffset.left
+            };
+        }
+
+        return results;
+    },
+
+    offsetParent: function() {
+        var offsetParent = this[0].offsetParent;
+        while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
+            offsetParent = offsetParent.offsetParent;
+        return jQuery(offsetParent);
     }
-
-    function add(l, t) {
-        left += parseInt(l) || 0;
-        top += parseInt(t) || 0;
-    }
-};
-})();
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ['Left', 'Top'], function(i, name) {
+    var method = 'scroll' + name;
+    
+    jQuery.fn[ method ] = function(val) {
+        if (!this[0]) return;
+
+        return val != undefined ?
+
+            // Set the scroll offset
+            this.each(function() {
+                this == window || this == document ?
+                    window.scrollTo(
+                        !i ? val : jQuery(window).scrollLeft(),
+                         i ? val : jQuery(window).scrollTop()
+                    ) :
+                    this[ method ] = val;
+            }) :
+
+            // Return the scroll offset
+            this[0] == window || this[0] == document ?
+                self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
+                    jQuery.boxModel && document.documentElement[ method ] ||
+                    document.body[ method ] :
+                this[0][ method ];
+    };
+});
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function(i, name){
+
+    var tl = i ? "Left"  : "Top",  // top or left
+        br = i ? "Right" : "Bottom"; // bottom or right
+
+    // innerHeight and innerWidth
+    jQuery.fn["inner" + name] = function(){
+        return this[ name.toLowerCase() ]() +
+            num(this, "padding" + tl) +
+            num(this, "padding" + br);
+    };
+
+    // outerHeight and outerWidth
+    jQuery.fn["outer" + name] = function(margin) {
+        return this["inner" + name]() +
+            num(this, "border" + tl + "Width") +
+            num(this, "border" + br + "Width") +
+            (margin ?
+                num(this, "margin" + tl) + num(this, "margin" + br) : 0);
+    };
+
+});})();

branches/comu-ver2/html/user_data/packages/default/js/layout_design.js

@@ -2 +2 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2008 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -20 +20 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-// サイズ管理クラスの定義
-function SC_Size() {
-    this.id = '';               // ID
-    this.left = 0;              // 配置するY軸座標
-    this.top = 0;               // 配置するX軸座標
-    this.width = 0;             // オブジェクトの幅
-    this.height = 0;            // オブジェクトの高さ
-    this.target_id = '';        // 配置場所（左ナビとか）
-    this.margin = 10;           // 上のオブジェクトとの幅
-    this.obj;
-};
-
-// 変数宣言
-var defUnused = 500;    // 未使用領域のデフォルトの高さ
-var defNavi   = 400;    // 左右ナビのデフォルトの高さ
-var defMainNavi  = 100; // メイン上下のデフォルトの高さ
-var defMain   = 200;    // メインのデフォルトの高さ
-
-var NowMaxHeight = 0;       // 現在の最大の高さ
-var MainHeight = 200;
-
-var marginUnused    = 688;  // 未使用領域の左マージン
-var marginLeftNavi  = 180;  // 左ナビの左マージン
-var marginRightNavi = 512;  // 右ナビの左マージン
-var marginMain      = 348;  // メイン上下の左マージン
-var marginMainFootTop= 595; // メイン下の上マージン
-
-var gDragged = "";          // ドラッグ中オブジェクト
-var gDropTarget = "";       // ドラッグ開始時のDropTarget
-
-var arrObj = new Object();  // ブロックオブジェクト格納用
-
-var mouseFlg = false;
-
-var all_elms;               // divタグオブジェクト格納用
-
-// ウィンドウサイズ
-var scrX;
-var scrY;
-
-// イベントの関連付けを行う
-function addEvent( elm, evtType, fn, useCapture) {
-
-    if (elm.addEventListener) {
-        elm.addEventListener(evtType, fn, useCapture);
-        return true;
-
-    }
-    else if (elm.attachEvent) {
-
-        var r = elm.attachEvent('on' + evtType, fn);
-        return r;
-
-    }
-    else {
-        elm['on'+evtType] = fn;
-
-    }
+(function($){
+    var updateUpDown = function(sortable){
+        $('div:not(.ui-sortable-helper)', sortable)
+            .removeClass('first')
+            .filter(':first').addClass('first').end()
+            .children('input.target-id').val(sortable.id).end()
+            .each(function(){
+                var top = $(this).prevAll().length + 1;
+                $(this).children('input.top').val(top);
+            });
+    };
     
-}
-
-
-// イベントの関連付けを解除
-function removeEvent( elm, evtType, fn, useCapture) {
-
-    if (elm.removeEventListener) {
-
-        elm.removeEventListener(evtType, fn, useCapture);
-        return true;
-
-    }
-    else if (elm.detachEvent) {
-
-        var r = elm.detachEvent('on' + evtType, fn);
-        return r;
-
-    }
-    else {
-
-        elm['on'+evtType] = fn;
-
-    }
-   
-}
-
-// マウスカーソルを変更
-function setCursor ( elm, curtype ) {
-    elm.style.cursor = curtype;
-}
-
-// オブジェクトの透明度を変更   
-function setOpacity(node,val) {
-
-    if (node.filters) {
-        node.filters["alpha"].opacity = val*100;
-    } else if (node.style.opacity) {
-        node.style.opacity = val;
-    }
-}
-
-// Zindexを変更する（前面表示切替）
-function setZindex(node, val) {
-    node.style.zIndex = val;
-//  alert(val);
-}
-
-// 値を取得
-function getAttrValue ( elm, attrname ) {
-
-    if (typeof(elm.attributes[ attrname ]) != 'undefined') {
-        return elm.attributes[ attrname ].nodeValue;
-    }
-
-/*
-//  if (typeof(elm.attributes.getNamedItem(attrname)) != 'object'){
-        val = "";
-        if((typeof ScriptEngineMajorVersion)=='function')
-        {
-            if( Math.floor(ScriptEngineMajorVersion()) == 5 &&
-                navigator.userAgent.indexOf("Win")!=-1) //win-e5対応
-                {
-                val = elm.attributes.item(attrname)
-                }
-            else
-            {
-                val = elm.attributes.getNamedItem(attrname)
-            }
-        } else {
-            val = elm.attributes.getNamedItem(attrname)
-        }
-        
-        alert(val.value);
-        
-        return val.value;
-//  }
-*/
-}
-
-// 値をセット
-function setAttrValue ( elm, attrname, val ) {
-    elm.attributes[ attrname ].nodeValue = val;
-}
-
-// オブジェクトのX座標を取得
-function getX ( elm ) {
-//   return parseInt(elm.style.left);
-    return parseInt(elm.offsetLeft);
-}
-
-// オブジェクトのY座標を取得
-function getY ( elm ) {
-    return parseInt(elm.offsetTop);
-//    return parseInt(elm.style.top);
-}
-
-// X座標を取得
-function getEventX ( evt ) {
-    return evt.clientX ? evt.clientX : evt.pageX;
-}
-
-// Y座標を取得
-function getEventY ( evt ) {
-    return evt.clientY ? evt.clientY : evt.pageY;
-}
-
-// オブジェクトの幅を取得
-function getWidth ( elm ) {
-    return parseInt( elm.style.width );
-}
-
-// オブジェクトの高さを取得
-function getHeight ( elm ) {
-//    return parseInt( elm.style.height );
-    return parseInt( elm.offsetHeight );
-}
-
-// ページの可視領域のX座標を取得する
-function getPageScrollX()
-{
-    var x = 0;
-
-    if (document.body && document.body.scrollLeft != null) {
-        x = document.body.scrollLeft;
-    } else if (document.documentElement && document.documentElement.scrollLeft != null) {
-        x = document.documentElement.scrollLeft;
-    } else if (window.scrollX != null) {
-        x = window.scrollX;
-    } else if (window.pageXOffset != null) {
-        x = window.pageXOffset;
-    }
-    
-    return x;
-}
-
-// ページの可視領域のY座標を取得する
-function getPageScrollY()
-{
-    var y = 0;
-    
-    if (document.body && document.body.scrollTop != null) {
-        y = document.body.scrollTop;
-    } else if (document.documentElement && document.documentElement.scrollTop != null) {
-        y = document.documentElement.scrollTop;
-    } else if (window.scrollY != null) {
-        y = window.scrollY;
-    } else if (window.pageYOffset != null) {
-        y = window.pageYOffset;
-    }
-    
-    return y;
-}
-
-
-// オブジェクトの座標をセット
-function moveElm ( elm, x, y ) {
-    elm.style.left = x + 'px';
-    elm.style.top = y + 'px';
-}
-
-// マウスダウンイベント
-function onMouseDown (evt) {
-
-    var target = evt.target ? evt.target : evt.srcElement;
-    var x = getEventX ( evt );
-    var y = getEventY ( evt );
-
-    //
-    // Save Information to Globals
-    //
-    if (mouseFlg == false) {
+    var sortableUpdate = function(e, ui){
+        updateUpDown(ui.element[0]);
+        if(ui.sender)
+            updateUpDown(ui.sender[0]);
+    };
     
-        gDragged = target;
-    
-        gDeltaX = x - getX(gDragged);
-        gDeltaY = y - getY(gDragged);
-    
-        gDraggedId = getAttrValue ( gDragged, 'did' );
-        setCursor ( gDragged, 'move' );
-    
-        gOrgX = getX ( gDragged );
-        gOrgY = getY ( gDragged );
-        gtarget_id = getAttrValue ( gDragged, 'target_id' );
-    
-        //
-        // Set
-        //
-       
-        // ドラッグ中は半透明
-        setOpacity ( gDragged, 0.6 );
-    
-        // ドラッグ中は最前面表示
-        setZindex ( gDragged , 2);
-        
-        addEvent ( document, 'mousemove', onMouseMove, false );
-        addEvent ( document, 'mouseup', onMouseUp, false );
-
-        // ドラッグを開始したときは高さを一度初期化する。
-        NowMaxHeight = defNavi;
-                
-        mouseFlg = true;
-    }
-}
-
-
-// マウスムーブイベント
-function onMouseMove(evt) {
-
-    // 現在の座標を取得
-    var x = getEventX ( evt ) + document.body.scrollLeft;                   // マウス座標 X
-    var y = getEventY ( evt ) + document.body.scrollTop;                    // マウス座標 Y
-    var nowleft = getEventX ( evt ) - gDeltaX;  // オブジェクト座標 LEFT
-    var nowtop = getEventY ( evt ) - gDeltaY;   // オブジェクト座標 TOP
-
-    // オブジェクトを移動
-    moveElm ( gDragged, nowleft, nowtop );
-    
-    for ( var i = 0; i < all_elms.length; i++ ) {
-        // drop-target上にきた場合にのみ処理を行う
-        if ( isEventOnElm ( evt, all_elms[i].id ) ) {
-            if ( all_elms[i].attributes['tid'] ) {
-                var tid = getAttrValue ( all_elms[i], 'tid' );
-                
-                // 背景色の変更 未使用領域は変更しない
-                all_elms[i].style.background="#ffffdd";
-                
-                // target_id の書き換え
-                setAttrValue ( gDragged, 'target_id', tid );
-
-                //objCheckLine.style.top = parseInt(nowtop) + parseInt(gDragged.style.height) / 2 + 'px';
-                //objCheckLine.style.top = y;
-
-                // 配列の再作成
-                fnCreateArr(1, y, x);
-                // 配列の並び替え
-                fnChangeObj(tid);
-            }
-        }else{
-            if ( all_elms[i].attributes['tid'] && all_elms[i].style.background!="#ffffff") {
-                // 背景色の変更
-                all_elms[i].style.background="#ffffff";
-            }
-        }
-    }
-}
-
-// マウスアップイベント       
-function onMouseUp(evt) {
-    // イベントの関連付け解除
-    if (mouseFlg == true) {
-        removeEvent ( document, 'mousemove', onMouseMove, false );
-        removeEvent ( document, 'mouseup', onMouseUp, false );
-        mouseFlg = false;
-    }
-
-    if ( !isOnDropTarget (evt) ) {
-        // 元の位置に戻す
-        moveElm ( gDragged, gOrgX, gOrgY );
-        setAttrValue ( gDragged, 'target_id', gtarget_id );
-
-        // 配列の再作成
-        fnCreateArr(1, gOrgY, gOrgX);
-    }
+    $(document).ready(function(){
+        var els = ['#MainHead', '#MainFoot', '#LeftNavi', '#RightNavi', '#Unused'];
+        var $els = $(els.toString());
+        
+        $els.each(function(){
+            updateUpDown(this);
+        });
+        
+        $els.sortable({
+            items: '> div',
+            //handle: 'dt',
+            cursor: 'move',
+            //cursorAt: { top: 2, left: 2 },
+            //opacity: 0.8,
+            //helper: 'clone',
+            appendTo: 'body',
+            placeholder: 'clone',
+            placeholder: 'placeholder',
+            connectWith: els,
+            start: function(e,ui) {
+                ui.helper.css("width", ui.item.width());
+            },
+            //change: sortableChange,
+            update: sortableUpdate
+        });
+    });
     
-    // hidden要素の書き換え
-    var did = getAttrValue( gDragged, 'did' );
-    var target_id = "target_id_"+did;
-    document.form1[target_id].value = getAttrValue( gDragged, 'target_id' );
-    
-    // 半透明、マウスポインタ、最前面処理を戻す
-    setOpacity( gDragged, 1);
-    setCursor ( gDragged, 'move' );
-    setZindex ( gDragged , 1);
-    
-    // 並び替え
-    fnSortObj();
-    
-    // 背景色を戻す
-    for ( var i = 0; i < all_elms.length; i++ ) {
-        // drop-target上にきた場合にのみ処理を行う
-        if ( isEventOnElm ( evt, all_elms[i].id ) && all_elms[i].attributes['tid']) {
-            // 背景色の変更
-            all_elms[i].style.background="#ffffff";
-        }
-    }
-}
-
-// DropTarget上にオブジェクトが来たかを判断する
-function isOnDropTarget ( evt ) {
-   
-    for ( var i=0; i<all_elms.length; i++ ) {
-        if ( isEventOnElm ( evt, all_elms[i].id ) ) {
-            if ( all_elms[i].attributes['tid'] ) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-function isEventOnElm (evt, drop_target_id) {
-
-    if (drop_target_id == '') {
-        return '';
-    }
-
-    var evtX = getEventX(evt) + getPageScrollX();
-    var evtY = getEventY(evt) + getPageScrollY();
-    
-    var drop_target = $("#" + drop_target_id );
-
-    var offset = drop_target.offset();
-    var x = offset.left;
-    var y = offset.top;
-
-    var width = drop_target.width();
-    var height = drop_target.height();
-    
-//  alert(evtX +" / "+ x +" / "+ evtY +" / "+ y +" / "+ width +" / "+ height);
-
-    return evtX > x && evtY > y && evtX < x + width && evtY < y + height;
-}
-
-// オブジェクトの並び替えを行う
-function fnSortObj(){
-    fnSetTargetHeight();
-    for ( var cnt = 0; cnt < all_elms.length; cnt++ ) {
-
-        // classが drop-target の場合のみ処理を行う
-        if ( getAttrValue ( all_elms[cnt], 'class' ) == 'drop-target' ) {
-            var tid = getAttrValue ( all_elms[cnt], 'tid' );
-            
-            // 配列の並び替え
-            fnChangeObj(tid);
-            
-            // 配置
-            fnSetObj( tid, cnt );
-        }
-    }
-}
-
-function alerttest(msg, x, y){
-    alert(msg);
-}
-
-// 配列の作成
-function fnCreateArr( addEvt , top , left ){
-
-    var arrObjtmp = new Object();
-    arrObjtmp['LeftNavi'] = Array();
-    arrObjtmp['RightNavi'] = Array();
-    arrObjtmp['MainHead'] = Array();
-    arrObjtmp['MainFoot'] = Array();
-    arrObjtmp['Unused'] = Array();
-
-    for ( var i = 1; i < all_elms.length; i++ ) {
-        // classが dragged-elm の場合のみ処理を行う
-        if ( getAttrValue ( all_elms[i], 'class' ) == "dragged-elm" ) {
-        
-            // マウスダウンイベントと関連付けを行う
-            if (addEvt == 0) {
-                addEvent ( all_elms[i], 'mousedown', onMouseDown, false );
-            }
-
-            var target_id = getAttrValue ( all_elms[i], 'target_id' );  
-            var len = arrObjtmp[target_id].length;
-            var did = getAttrValue ( all_elms[i], 'did' );
-            
-            arrObjtmp[target_id][len] = new SC_Size();
-            arrObjtmp[target_id][len].id = did;
-            arrObjtmp[target_id][len].obj = all_elms[i];
-            arrObjtmp[target_id][len].width = getWidth( all_elms[i] );
-            arrObjtmp[target_id][len].height = getHeight( all_elms[i] );
-
-            // ドラッグ中のオブジェクトが存在すれば、そのオブジェクトだけマウスポインタの座標を指定する。
-            if (gDragged != "") {
-                if (did != getAttrValue ( gDragged, 'did' )) {
-                    // top は常にオブジェクトの中心を取得するようにする
-                    arrObjtmp[target_id][len].top = (parseInt(getY( all_elms[i] )) + arrObjtmp[target_id][len].height / 2 );
-                    arrObjtmp[target_id][len].left = getX( all_elms[i] );
-                }else {
-                    arrObjtmp[target_id][len].top = top;
-                    arrObjtmp[target_id][len].left = left;
-                }
-            } else {
-                // top は常にオブジェクトの中心を取得するようにする
-                arrObjtmp[target_id][len].top = i;
-                arrObjtmp[target_id][len].left = getX( all_elms[i] );
-            }
-        }
-    }
-    
-    arrObj = arrObjtmp;
-}
-
-// 配列の並び替え (バブルソートで並び替えを行う) 
-function fnChangeObj( tid ){
-    for ( var i = 0; i < arrObj[tid].length-1; i++ ) {
-        for ( var j = arrObj[tid].length-1; j > i; j-- ) {
-            if ( arrObj[tid][j].top < arrObj[tid][i].top ) {
-                var arrTemp = new Array();
-                arrTemp = arrObj[tid][j];
-                arrObj[tid][j] = arrObj[tid][i];
-                arrObj[tid][i] = arrTemp;
-            }
-        }
-    }
-}
-
-// 配置
-function fnSetObj( tid, cnt ){
-    var target_height = 0;
-    
-    drp_left = getX(all_elms[cnt]); //all_elms[cnt].offsetLeft;
-    drp_top = getY(all_elms[cnt]); //all_elms[cnt].offsetTop;
-
-    for ( var j = 0; j < arrObj[tid].length; j++ ) {
-        // 配置する座標の取得
-        var left = parseInt(drp_left) + parseInt(all_elms[cnt].style.width) / 2 - parseInt(arrObj[tid][j].width) / 2;
-        if (j == 0){
-            var top = drp_top + arrObj[tid][j].margin;
-        }else{
-            var top = arrObj[tid][j-1].top + arrObj[tid][j].margin + arrObj[tid][j-1].height
-        }
-
-        // 座標を保持
-        arrObj[tid][j].top = top;
-        arrObj[tid][j].left = left;
-
-        // 配置を行う
-        moveElm ( arrObj[tid][j].obj, left ,top);
-
-        // 高さ計算
-        target_height = target_height + arrObj[tid][j].margin + arrObj[tid][j].height;
-
-        // hiddenの値を書き換え
-        var top_id = "top_" + arrObj[tid][j].id;
-        document.form1[top_id].value = top;
-
-    }
-}
-
-// ドロップターゲットの高さ調整
-function fnSetTargetHeight(){
-
-    var NaviHeight = defNavi;
-    var MainHeadHeight = defMainNavi;
-    var MainFootHeight = defMainNavi;
-    var UnusedHeight = defUnused;
-
-    // 高さ計算
-    $(".drop-target").each(function(){
-        var target_height = 0;
-        var tid = $(this).attr("tid");
-
-        for ( var j = 0; j < arrObj[tid].length; j++ ) {
-            target_height = target_height + arrObj[tid][j].margin + arrObj[tid][j].height;
-        }
-
-        // 下の幅
-        target_height = target_height + 20;
-
-        // 左右ナビ、未使用領域の高さを保持
-        if (tid == 'LeftNavi' || tid == 'RightNavi' || tid == 'Unused') {
-            if (NaviHeight < target_height) {
-                NaviHeight = target_height;
-            }
-        }
-
-        // メイン上部領域の高さを保持
-        if (tid == 'MainHead') {
-            if (target_height > defMainNavi) {
-                MainHeadHeight = target_height;
-            }
-        }
-
-        // メイン下部領域の高さを保持
-        if (tid == 'MainFoot') {
-            if (target_height > defMainNavi) {
-                MainFootHeight = target_height;
-            }
-        }
+    $(window).bind('load',function(){
+        setTimeout(function(){
+            $('#overlay').fadeOut(function(){
+                $('body').css('overflow', 'auto');
+            });
+        }, 750);
     });
-
-    // メイン領域の高さを保持
-//  alert(NaviHeight+"/"+MainHeadHeight+"/"+MainFootHeight);
-    MainHeight = NaviHeight - ( MainHeadHeight + MainFootHeight );
-    if (MainHeight < defMain) {
-        MainHeight = defMain;
-    }
-
-    // メイン部分のほうが大きい場合には左右ナビも大きくする
-    if (NaviHeight < MainHeadHeight + MainFootHeight + MainHeight) {
-        NaviHeight = MainHeadHeight + MainFootHeight + MainHeight;  
-    }
-    // 変更
-    $(".drop-target").each(function(){
-        var tid = $(this).attr("tid");
-
-        // tidによって処理を分ける
-        if (tid == 'LeftNavi' || tid == 'RightNavi') {
-            $(this).height(NaviHeight);
-        }else if (tid == 'MainHead' ) {
-            $(this).height(MainHeadHeight);
-        }else if (tid == 'MainFoot') {
-            $(this).height(MainFootHeight);
-        }else if (tid == 'Unused'){
-            $(this).height(NaviHeight+100);
-        }
-    });
-    
-    // メインテーブルの高さも変更
-    $("#layout-main").height(MainHeight-2);
-}
-
-//ウインドウサイズ取得
-function GetWindowSize(type){
-    var ua = navigator.userAgent;                                               // ユーザーエージェント
-    var nWidth, nHeight;                                                        // サイズ
-    var nHit = ua.indexOf("MSIE");                                              // 合致した部分の先頭文字の添え字
-    var bIE = (nHit >=  0);                                                     // IE かどうか
-    var bVer6 = (bIE && ua.substr(nHit+5, 1) == "6");                           // バージョンが 6 かどうか
-    var bStd = (document.compatMode && document.compatMode=="CSS1Compat");      // 標準モードかどうか
-
-    switch(type){
-        case "width":
-            if(bIE){
-                if (bVer6 && bStd) {
-                    return document.documentElement.clientWidth;
-                } else {
-                    return document.body.clientWidth;
-                }
-            }else if(document.layers){
-                return(innerWidth);
-            }else{
-                return(-1);
-            }
-        break;
-        case "height":
-            if(bIE){
-                if (bVer6 && bStd) {
-                    return document.documentElement.clientHeight;
-                } else {
-                    return document.body.clientHeight;
-                }
-                return(document.body.clientHeight);
-            }else if(document.layers){
-                return(innerHeight);
-            }else{
-                return(-1);
-            }
-        break;
-        default:
-            return(-1);
-        break;
-    }
-}
-
-// ウィンドウサイズが変更になったときは全てのオブジェクトも移動する
-function fnMoveObject() {
-
-    // ウィンドウの幅変更比率を取得
-    var moveX = GetWindowSize("width") - scrX;
-    var BlankX = ( GetWindowSize("width") - 878 ) / 2
-
-    $(".drop-target").each(function(){
-        if ($(this).css("left") == "") {
-            var tid = $(this).attr('tid');
-
-            if (tid == 'LeftNavi') {
-                LeftMargin = marginLeftNavi;
-            }else if (tid == 'RightNavi') {
-                LeftMargin = marginRightNavi;
-            }else if (tid == 'MainHead' || tid == 'MainFoot') {
-                LeftMargin = marginMain;
-            }else{
-                LeftMargin = marginUnused;
-            }
-
-            if (BlankX > 0) {
-                $(this).css("left", BlankX + LeftMargin + 'px');
-            }else{
-                $(this).css("left", LeftMargin + 'px');
-            }
-        }
-    });
-    
-    scrX = GetWindowSize("width");
-    scrY = GetWindowSize("height");
-    
-    fnSortObj();
-}
-// 画面のロードイベントに関連付け
-addEvent ( window, 'load', init, false );
+})(jQuery);