jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357246 )
Change subject: Hygiene: remove div overflow JavaScript transform
......................................................................
Hygiene: remove div overflow JavaScript transform
On closer inspection and review with Monte, this transform no longer
seems necessary.
Bug: T164322
Change-Id: I90e0fa0efdb02852d07d7fb51c1d22cca19a7aa6
---
M app/src/main/assets/bundle.js
M www/js/sections.js
D www/js/transforms/setDivWidth.js
3 files changed, 6 insertions(+), 45 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index 596df8d..d2fba1c 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -91,7 +91,7 @@
module.exports = new ActionsHandler();
-},{"./bridge":2,"./utilities":24}],2:[function(require,module,exports){
+},{"./bridge":2,"./utilities":23}],2:[function(require,module,exports){
function Bridge() {
}
@@ -217,7 +217,7 @@
setImageBackgroundsForDarkMode: setImageBackgroundsForDarkMode
};
-},{"./bridge":2,"./constant":3,"./loader":8,"./utilities":24}],5:[function(require,module,exports){
+},{"./bridge":2,"./constant":3,"./loader":8,"./utilities":23}],5:[function(require,module,exports){
var transformer = require('./transformer');
transformer.register( 'displayDisambigLink', function( content ) {
@@ -462,7 +462,6 @@
// client only transformations:
transformer.transform( "addDarkModeStyles", content ); // client setting
- transformer.transform( "setDivWidth", content ); // offsetWidth
if (!window.isMainPage) {
transformer.transform( "hideTables", content ); // clickHandler
@@ -530,7 +529,6 @@
}
transformer.transform( "addDarkModeStyles", content ); // client setting
- transformer.transform( "setDivWidth", content ); // offsetWidth
transformer.transform( "hideRefs", content ); // clickHandler
@@ -714,7 +712,7 @@
handleTableCollapseOrExpandClick: toggleCollapseClickCallback
};
-},{"../transformer":14,"wikimedia-page-library":25}],17:[function(require,module,exports){
+},{"../transformer":14,"wikimedia-page-library":24}],17:[function(require,module,exports){
var transformer = require("../transformer");
var collapseTables = require("./collapseTables");
@@ -940,24 +938,6 @@
}
},{"../../transformer":14}],22:[function(require,module,exports){
-var transformer = require("../transformer");
-
-transformer.register( "setDivWidth", function( content ) {
- var allDivs = content.querySelectorAll( 'div' );
- var contentWrapper = document.getElementById( "content" );
- var clientWidth = contentWrapper.offsetWidth;
- for ( var i = 0; i < allDivs.length; i++ ) {
- if (allDivs[i].style && allDivs[i].style.width) {
- // if this div has an explicit width, and it's greater than our
client width,
- // then make it overflow (with scrolling), and reset its width to
100%
- if (parseInt(allDivs[i].style.width) > clientWidth) {
- allDivs[i].style.overflowX = "auto";
- allDivs[i].style.width = "100%";
- }
- }
- }
-} );
-},{"../transformer":14}],23:[function(require,module,exports){
var maybeWidenImage =
require('wikimedia-page-library').WidenImage.maybeWidenImage;
var transformer = require("../transformer");
var utilities = require("../utilities");
@@ -1016,7 +996,7 @@
}
} );
-},{"../transformer":14,"../utilities":24,"wikimedia-page-library":25}],24:[function(require,module,exports){
+},{"../transformer":14,"../utilities":23,"wikimedia-page-library":24}],23:[function(require,module,exports){
function hasAncestor( el, tagName ) {
if (el !== null && el.tagName === tagName) {
@@ -1111,7 +1091,7 @@
firstAncestorWithMultipleChildren: firstAncestorWithMultipleChildren
};
-},{}],25:[function(require,module,exports){
+},{}],24:[function(require,module,exports){
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ?
module.exports = factory() :
typeof define === 'function' && define.amd ? define(factory) :
@@ -1671,4 +1651,4 @@
})));
-},{}]},{},[2,9,24,14,15,16,17,22,23,18,19,20,21,1,5,6,7,8,4,11,12,13]);
+},{}]},{},[2,9,23,14,15,16,17,22,18,19,20,21,1,5,6,7,8,4,11,12,13]);
diff --git a/www/js/sections.js b/www/js/sections.js
index a95d5d2..f5e6807 100644
--- a/www/js/sections.js
+++ b/www/js/sections.js
@@ -110,7 +110,6 @@
// client only transformations:
transformer.transform( "addDarkModeStyles", content ); // client setting
- transformer.transform( "setDivWidth", content ); // offsetWidth
if (!window.isMainPage) {
transformer.transform( "hideTables", content ); // clickHandler
@@ -178,7 +177,6 @@
}
transformer.transform( "addDarkModeStyles", content ); // client setting
- transformer.transform( "setDivWidth", content ); // offsetWidth
transformer.transform( "hideRefs", content ); // clickHandler
diff --git a/www/js/transforms/setDivWidth.js b/www/js/transforms/setDivWidth.js
deleted file mode 100644
index 1cd622a..0000000
--- a/www/js/transforms/setDivWidth.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var transformer = require("../transformer");
-
-transformer.register( "setDivWidth", function( content ) {
- var allDivs = content.querySelectorAll( 'div' );
- var contentWrapper = document.getElementById( "content" );
- var clientWidth = contentWrapper.offsetWidth;
- for ( var i = 0; i < allDivs.length; i++ ) {
- if (allDivs[i].style && allDivs[i].style.width) {
- // if this div has an explicit width, and it's greater than our
client width,
- // then make it overflow (with scrolling), and reset its width to
100%
- if (parseInt(allDivs[i].style.width) > clientWidth) {
- allDivs[i].style.overflowX = "auto";
- allDivs[i].style.width = "100%";
- }
- }
- }
-} );
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/357246
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90e0fa0efdb02852d07d7fb51c1d22cca19a7aa6
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Mhurd <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Sniedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
