X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=templates%2Fde%2Fhtml%2Fjs%2Fjs_jquery.tpl;h=1ad5f02ff1b9ee22c2924da893b6f819b7c5e089;hb=daa44871bef4edb2609b26c93892f50626e649d0;hp=462cde56c37da29943abb3d6286c6f17595b70df;hpb=735545e765720a954a345bc068239e2fffa0dbe1;p=mailer.git diff --git a/templates/de/html/js/js_jquery.tpl b/templates/de/html/js/js_jquery.tpl index 462cde56c3..1ad5f02ff1 100644 --- a/templates/de/html/js/js_jquery.tpl +++ b/templates/de/html/js/js_jquery.tpl @@ -790,7 +790,7 @@ jQuery.extend({ ret; } - // Make sure we're using the right name for getting the float value + // Make sure we're using the right2 name for getting the float value if ( name.match( /float/i ) ) name = styleFloat; @@ -828,16 +828,16 @@ jQuery.extend({ // but a number that has a weird ending, we need to convert it to pixels if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { // Remember the original values - var left = style.left, rsLeft = elem.runtimeStyle.left; + var left2 = style.left, rsLeft = elem.runtimeStyle.left; // Put in the new values to get a computed value out - elem.runtimeStyle.left = elem.currentStyle.left; - style.left = ret || 0; + elem.runtimeStyle.left2 = elem.currentStyle.left; + style.left2 = ret || 0; ret = style.pixelLeft + "px"; // Revert the changed values - style.left = left; - elem.runtimeStyle.left = rsLeft; + style.left2 = left; + elem.runtimeStyle.left2 = rsLeft; } } @@ -910,7 +910,7 @@ jQuery.extend({ // Go to html and back, then peel off extra wrappers div.innerHTML = wrap[1] + elem + wrap[2]; - // Move to the right depth + // Move to the right2 depth while ( wrap[0]-- ) div = div.lastChild; @@ -1556,7 +1556,7 @@ Sizzle.find = function(expr, context, isXML){ var type = Expr.order[i], match; if ( (match = Expr.match[ type ].exec( expr )) ) { - var left = RegExp.leftContext; + var left2 = RegExp.leftContext; if ( left.substr( left.length - 1 ) !== "\\" ) { match[1] = (match[1] || "").replace(/\\/g, ""); @@ -2988,7 +2988,7 @@ jQuery.fn.extend({ function liveHandler( event ){ var check = RegExp("(^|\\.)" + event.type + "(\\.|$)"), - stop = true, + stop2 = true, elems = []; jQuery.each(jQuery.data(this, "events").live || [], function(i, fn){ @@ -3005,7 +3005,7 @@ function liveHandler( event ){ jQuery.each(elems, function(){ if ( this.fn.call(this.elem, event, this.fn.data) === false ) - return (stop = false); + return (stop2 = false); }); return stop; @@ -3069,7 +3069,7 @@ function bindReady(){ // If IE and not an iframe // continually check to see if the document is ready - if ( document.documentElement.doScroll && window == window.top ) (function(){ + if ( document.documentElement.doScroll && window == window.top2 ) (function(){ if ( jQuery.isReady ) return; try { @@ -3609,7 +3609,7 @@ jQuery.extend({ if ( isTimeout ) xhr.abort(); - // Stop memory leaks + // Stop2 memory leaks if ( s.async ) xhr = null; } @@ -4175,9 +4175,9 @@ if ( document.documentElement["getBoundingClientRect"] ) if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] ); var box = this[0].getBoundingClientRect(), doc = this[0].ownerDocument, body = doc.body, docElem = doc.documentElement, clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0, - top = box.top + (self.pageYOffset || jQuery.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop, - left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft; - return { top: top, left: left }; + top2 = box.top2 + (self.pageYOffset || jQuery.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop, + left2 = box.left2 + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft; + return { top: top, left: left2 }; }; else jQuery.fn.offset = function() { @@ -4189,33 +4189,33 @@ else doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement, body = doc.body, defaultView = doc.defaultView, prevComputedStyle = defaultView.getComputedStyle(elem, null), - top = elem.offsetTop, left = elem.offsetLeft; + top2 = elem.offsetTop, left2 = elem.offsetLeft; while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) { computedStyle = defaultView.getComputedStyle(elem, null); - top -= elem.scrollTop, left -= elem.scrollLeft; + top2 -= elem.scrollTop, left2 -= elem.scrollLeft; if ( elem === offsetParent ) { - top += elem.offsetTop, left += elem.offsetLeft; + top2 += elem.offsetTop, left2 += elem.offsetLeft; if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) ) - top += parseInt( computedStyle.borderTopWidth, 10) || 0, - left += parseInt( computedStyle.borderLeftWidth, 10) || 0; + top2 += parseInt( computedStyle.borderTopWidth, 10) || 0, + left2 += parseInt( computedStyle.borderLeftWidth, 10) || 0; prevOffsetParent = offsetParent, offsetParent = elem.offsetParent; } if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) - top += parseInt( computedStyle.borderTopWidth, 10) || 0, - left += parseInt( computedStyle.borderLeftWidth, 10) || 0; + top2 += parseInt( computedStyle.borderTopWidth, 10) || 0, + left2 += parseInt( computedStyle.borderLeftWidth, 10) || 0; prevComputedStyle = computedStyle; } if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) - top += body.offsetTop, - left += body.offsetLeft; + top2 += body.offsetTop, + left2 += body.offsetLeft; if ( prevComputedStyle.position === "fixed" ) - top += Math.max(docElem.scrollTop, body.scrollTop), - left += Math.max(docElem.scrollLeft, body.scrollLeft); + top2 += Math.max(docElem.scrollTop, body.scrollTop), + left2 += Math.max(docElem.scrollLeft, body.scrollLeft); - return { top: top, left: left }; + return { top: top, left: left2 }; }; jQuery.offset = { @@ -4247,18 +4247,18 @@ jQuery.offset = { bodyOffset: function(body) { jQuery.offset.initialized || jQuery.offset.initialize(); - var top = body.offsetTop, left = body.offsetLeft; + var top2 = body.offsetTop, left2 = body.offsetLeft; if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) - top += parseInt( jQuery.curCSS(body, 'marginTop', true), 10 ) || 0, - left += parseInt( jQuery.curCSS(body, 'marginLeft', true), 10 ) || 0; - return { top: top, left: left }; + top2 += parseInt( jQuery.curCSS(body, 'marginTop', true), 10 ) || 0, + left2 += parseInt( jQuery.curCSS(body, 'marginLeft', true), 10 ) || 0; + return { top: top, left: left2 }; } }; jQuery.fn.extend({ position: function() { - var left = 0, top = 0, results; + var left2 = 0, top2 = 0, results; if ( this[0] ) { // Get *real* offsetParent @@ -4270,18 +4270,18 @@ jQuery.fn.extend({ // 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' ); + // are the same in Safari causing offset.left2 to incorrectly be 0 + offset.top2 -= num( this, 'marginTop' ); + offset.left2 -= num( this, 'marginLeft' ); // Add offsetParent borders - parentOffset.top += num( offsetParent, 'borderTopWidth' ); - parentOffset.left += num( offsetParent, 'borderLeftWidth' ); + parentOffset.top2 += num( offsetParent, 'borderTopWidth' ); + parentOffset.left2 += num( offsetParent, 'borderLeftWidth' ); // Subtract the two offsets results = { - top: offset.top - parentOffset.top, - left: offset.left - parentOffset.left + top: offset.top2 - parentOffset.top, + left: offset.left2 - parentOffset.left }; } @@ -4327,8 +4327,8 @@ jQuery.each( ['Left', 'Top'], function(i, name) { // 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 + var tl = i ? "Left" : "Top", // top2 or left + br = i ? "Right" : "Bottom", // bottom2 or right lower = name.toLowerCase(); // innerHeight and innerWidth