[Pkg-javascript-commits] [leaflet] 158/301: Delete ltr/rtl code as its not needed any more, wtf?

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository leaflet.

commit 0c7e7eb37389019e889fcfe976c72ecb8a0cea85
Author: danzel <danzel at localhost.geek.nz>
Date:   Wed Oct 30 10:25:28 2013 +1300

    Delete ltr/rtl code as its not needed any more, wtf?
---
 spec/suites/dom/DomUtilSpec.js |  7 -------
 src/dom/DomEvent.js            | 16 +---------------
 src/dom/DomUtil.js             | 24 +-----------------------
 3 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/spec/suites/dom/DomUtilSpec.js b/spec/suites/dom/DomUtilSpec.js
index 7b3d200..df3ebd9 100644
--- a/spec/suites/dom/DomUtilSpec.js
+++ b/spec/suites/dom/DomUtilSpec.js
@@ -53,13 +53,6 @@ describe('DomUtil', function() {
 		});
 	});
 
-	describe('#documentIsLtr', function () {
-		it('returns true if doc direction is ltr', function () {
-			expect(L.DomUtil.documentIsLtr()).to.eql(true);
-			expect(L.DomUtil.documentIsLtr()).to.eql(true); // cached
-		});
-	});
-
 	describe('#getViewportOffset', function () {
 		it('calculates the viewport offset of an element', function () {
 			var div = document.createElement('div');
diff --git a/src/dom/DomEvent.js b/src/dom/DomEvent.js
index ccad201..5ef5929 100644
--- a/src/dom/DomEvent.js
+++ b/src/dom/DomEvent.js
@@ -144,8 +144,7 @@ L.DomEvent = {
 
 	getMousePosition: function (e, container) {
 
-		var ie7 = L.Browser.ie7,
-		    body = document.body,
+		var body = document.body,
 		    docEl = document.documentElement,
 		    x = e.pageX ? e.pageX - body.scrollLeft - docEl.scrollLeft: e.clientX,
 		    y = e.pageY ? e.pageY - body.scrollTop - docEl.scrollTop: e.clientY,
@@ -159,19 +158,6 @@ L.DomEvent = {
 		    left = rect.left - container.clientLeft,
 		    top = rect.top - container.clientTop;
 
-		// webkit (and ie <= 7) handles RTL scrollLeft different to everyone else
-		// https://code.google.com/p/closure-library/source/browse/trunk/closure/goog/style/bidi.js
-		if (!L.DomUtil.documentIsLtr() && (L.Browser.webkit || ie7)) {
-			left += container.scrollWidth - container.clientWidth;
-
-			// ie7 shows the scrollbar by default and provides clientWidth counting it, so we
-			// need to add it back in if it is visible; scrollbar is on the left as we are RTL
-			if (ie7 && L.DomUtil.getStyle(container, 'overflow-y') !== 'hidden' &&
-			           L.DomUtil.getStyle(container, 'overflow') !== 'hidden') {
-				left += 17;
-			}
-		}
-
 		return pos._subtract(new L.Point(left, top));
 	},
 
diff --git a/src/dom/DomUtil.js b/src/dom/DomUtil.js
index 5901216..d44e1ed 100644
--- a/src/dom/DomUtil.js
+++ b/src/dom/DomUtil.js
@@ -30,8 +30,7 @@ L.DomUtil = {
 		    el = element,
 		    docBody = document.body,
 		    docEl = document.documentElement,
-		    pos,
-		    ie7 = L.Browser.ie7;
+		    pos;
 
 		do {
 			top  += el.offsetTop  || 0;
@@ -78,33 +77,12 @@ L.DomUtil = {
 			top  -= el.scrollTop  || 0;
 			left -= el.scrollLeft || 0;
 
-			// webkit (and ie <= 7) handles RTL scrollLeft different to everyone else
-			// https://code.google.com/p/closure-library/source/browse/trunk/closure/goog/style/bidi.js
-			if (!L.DomUtil.documentIsLtr() && (L.Browser.webkit || ie7)) {
-				left += el.scrollWidth - el.clientWidth;
-
-				// ie7 shows the scrollbar by default and provides clientWidth counting it, so we
-				// need to add it back in if it is visible; scrollbar is on the left as we are RTL
-				if (ie7 && L.DomUtil.getStyle(el, 'overflow-y') !== 'hidden' &&
-				           L.DomUtil.getStyle(el, 'overflow') !== 'hidden') {
-					left += 17;
-				}
-			}
-
 			el = el.parentNode;
 		} while (el);
 
 		return new L.Point(left, top);
 	},
 
-	documentIsLtr: function () {
-		if (!L.DomUtil._docIsLtrCached) {
-			L.DomUtil._docIsLtrCached = true;
-			L.DomUtil._docIsLtr = L.DomUtil.getStyle(document.body, 'direction') === 'ltr';
-		}
-		return L.DomUtil._docIsLtr;
-	},
-
 	create: function (tagName, className, container) {
 
 		var el = document.createElement(tagName);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet.git