MediaWiki:Common.js - Revision history

TL at 09:53, 17 June 2015

2015-06-17T09:53:21Z

2015-06-17T09:52:57Z

2015-06-16T12:19:53Z

2015-06-16T11:31:24Z

2015-06-16T10:57:28Z

2015-06-16T10:50:45Z

2015-06-16T10:46:51Z

2015-06-16T10:29:56Z

2015-06-16T10:21:30Z

2015-06-16T09:17:33Z

@@ Line 14: / Line 14: @@
   ph = Math.min(eh,Math.floor(mh/2));
   t.parentNode.setAttribute('data-expand-cont-height', ph);
-  $(t.parentNode).addClass('expand-image-cont').addClass('expand-image-cont-min').height(ph);
+  $(t.parentNode).addClass('expand-image-cont').height(ph);
+}
 function open_in_mmv(href) { var t = $('a.image[href="' + (href || this.href) + '"]').not(":has(img.expand-image)"); return t && t.length ? (t[0].click() || false) && false : true; }

@@ Line 2: / Line 2: @@
 function set_expand_sizes() {
-  var t, th = $(this), r, fw, fh, mw, mh, mul, ew, eh;
+  var t, th = $(this), r, fw, fh, mw, mh, mul, ew, eh, ph;
   t = th[0];
   r = (fw = parseInt(t.getAttribute('data-file-width'))) / (fh = parseInt(t.getAttribute('data-file-height')));
@@ Line 12: / Line 12: @@
   t.style.width = ew + 'px';t.style.height = eh + 'px';
   t.style.maxHeight='none';t.style.maxWidth = 'none';
+}
 function open_in_mmv(href) { var t = $('a.image[href="' + (href || this.href) + '"]').not(":has(img.expand-image)"); return t && t.length ? (t[0].click() || false) && false : true; }
 $('img.expand-image').removeClass('expand-on-hover').click(function () {
-  var t = $(this); t.toggleClass('expanded-image');
+  var t = $(this), p = $(this.parentNode); t.toggleClass('expanded-image');
-  if (t.hasClass('expanded-image')) { t.height(this.naturalHeight).width(this.naturalWidth); }
+  if (t.hasClass('expanded-image')) { t.height(this.naturalHeight).width(this.naturalWidth); p.height(this.naturalHeight); }
-  else { t.height(t.attr('data-expand-height')).width(t.attr('data-expand-width')); }
+  else { t.height(t.attr('data-expand-height')).width(t.attr('data-expand-width')); p.height(p.attr('data-expand-cont-height')); }
   return false;
 }).each(set_expand_sizes);

@@ Line 17: / Line 17: @@
   var t = $(this); t.toggleClass('expanded-image');
   if (t.hasClass('expanded-image')) { t.height(this.naturalHeight).width(this.naturalWidth); }
-  else { t.height(t.attr('data-expand-height')).width(t.attr('data-expand-height')); }
+  else { t.height(t.attr('data-expand-height')).width(t.attr('data-expand-width')); }
   return false;
 }).each(set_expand_sizes);

@@ Line 2: / Line 2: @@
 function set_expand_sizes() {
-  var t = $(this); setTimeout(function(){
+  var t, th = $(this), r, fw, fh, mw, mh, mul, ew, eh;
-    t.attr('data-expand-width', '' + t.width()).attr('data-expand-height', '' + t.height());
+  r = (fw = parseInt(t.getAttribute('data-file-width'))) / (fh = parseInt(t.getAttribute('data-file-height')));
+}
 function open_in_mmv(href) { var t = $('a.image[href="' + (href || this.href) + '"]').not(":has(img.expand-image)"); return t && t.length ? (t[0].click() || false) && false : true; }
@@ Line 14: / Line 19: @@
   else { t.height(t.attr('data-expand-height')).width(t.attr('data-expand-height')); }
   return false;
-}).load(set_expand_sizes).each(set_expand_sizes);
+}).each(set_expand_sizes);

@@ Line 1: / Line 1: @@
 /* Any JavaScript here will be loaded for all users on every page load. */
 function open_in_mmv(href) { var t = $('a.image[href="' + (href || this.href) + '"]').not(":has(img.expand-image)"); return t && t.length ? (t[0].click() || false) && false : true; }
 $('img.expand-image').removeClass('expand-on-hover').click(function () {
@@ Line 7: / Line 14: @@
   else { t.height(t.attr('data-expand-height')).width(t.attr('data-expand-height')); }
   return false;

@@ Line 10: / Line 10: @@
   var t = $(this); setTimeout(function(){
     t.width(t.width()).height(t.height());
-    t.attr('data-expand-width', t.width()).attr('data-expand-height', t.height());
+    t.attr('data-expand-width', '' + t.width()).attr('data-expand-height', '' + t.height());
     t[0].style.maxHeight='none';t[0].style.maxWidth = 'none';
-  }, 10);
+  }, 100);
 });

@@ Line 9: / Line 9: @@
 }).load(function () {
   var t = $(this); setTimeout(function(){
-    t.width(t.width()).height(t.height()).attr('data-expand-width', t.width()).attr('data-expand-height', t.height()).css('maxHeight','none').css('maxWidth','none');
+    t.width(t.width()).height(t.height());
   }, 10);
 });

← Older revision		Revision as of 10:21, 16 June 2015
Line 2:		Line 2:

	function open_in_mmv(href) { var t = $('a.image[href="' + (href \|\| this.href) + '"]').not(":has(img.expand-image)"); return t && t.length ? (t[0].click() \|\| false) && false : true; }		function open_in_mmv(href) { var t = $('a.image[href="' + (href \|\| this.href) + '"]').not(":has(img.expand-image)"); return t && t.length ? (t[0].click() \|\| false) && false : true; }
−	$('img.expand-image').click(function () { ~~$(this).toggleClass('expanded-image'); return false; });~~	+	$('img.expand-image').removeClass('expand-on-hover').click(function () {
		+	var t = $(this); t.toggleClass('expanded-image');
		+	if (t.hasClass('expanded-image')) { t.height(this.naturalHeight).width(this.naturalWidth); }
		+	else { t.height(t.attr('data-expand-height')).width(t.attr('data-expand-height')); }
		+	return false;
		+	}).load(function () {
		+	t = $(this); t.width(t.width()).height(t.height()).attr('data-expand-width', t.width()).attr('data-expand-height', t.height()).css({maxHeight: 'none', maxWidth: 'none'});
		+	});