Inez has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/69822


Change subject: (bug 49896) Dirty workaround
......................................................................

(bug 49896) Dirty workaround

Change-Id: I9db6f0c7ab5162801545507bc08e220c7d107e6b
---
M js/lib/ext.core.LinkHandler.js
1 file changed, 15 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid 
refs/changes/22/69822/1

diff --git a/js/lib/ext.core.LinkHandler.js b/js/lib/ext.core.LinkHandler.js
index dccc52a..eae7865 100644
--- a/js/lib/ext.core.LinkHandler.js
+++ b/js/lib/ext.core.LinkHandler.js
@@ -882,10 +882,22 @@
                dataAttribs.img = {};
 
                dims = handleDims( height, width, info, dataAttribs );
-
                // Update some already-defined nonsense based on response
-               height = dims.h;
-               width = dims.w;
+               var widthFail = false;
+               if ( ( width && dims.w > width ) || dims.w === -1 ) {
+                       widthFail = true;
+                       width = width || 20;
+               } else {
+                       width = dims.w;
+               }
+               if ( !widthFail ) {
+                       if ( ( height && dims.h > height ) || dims.h === -1 ) {
+                               height = height || 20;
+                       } else {
+                               height = dims.h;
+                       }
+               }
+
                path = getPath( path, info );
 
                if ( oHash.alt ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/69822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9db6f0c7ab5162801545507bc08e220c7d107e6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Inez <i...@wikia-inc.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to