Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: small fix
  changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
  ignore utf8 offset error for unit tests
  had arg order backwards
  try assertContains
  tag tests cont.
  fix autonamenegativelength test
  some work on tests

* master:

3 files changed, 92 insertions, 0 deletions

diff --git a/view/theme/diabook-aerith/js/README b/view/theme/diabook-aerith/js/README
new file mode 100644
index 000000000..c93b2118e
--- /dev/null
+++ b/view/theme/diabook-aerith/js/README
@@ -0,0 +1,22 @@
+jQuery Resize Plugin Demo
+
+Version: v2.1.1
+Author: Adeel Ejaz (http://adeelejaz.com/)
+License: Dual licensed under MIT and GPL licenses.
+
+Introduction
+aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
+
+Usage:
+.aeImageResize( height, width )
+
+height
+An integer representing the maximum height for the image.
+
+width
+An integer representing the maximum width for the image.
+
+Example
+$(function() {
+  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
+});
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/js/jquery.ae.image.resize.js b/view/theme/diabook-aerith/js/jquery.ae.image.resize.js
new file mode 100644
index 000000000..bac09cd45
--- /dev/null
+++ b/view/theme/diabook-aerith/js/jquery.ae.image.resize.js
@@ -0,0 +1,69 @@
+(function( $ ) {
+
+  $.fn.aeImageResize = function( params ) {
+
+    var aspectRatio = 0
+      // Nasty I know but it's done only once, so not too bad I guess
+      // Alternate suggestions welcome :)
+      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
+      ;
+
+    // We cannot do much unless we have one of these
+    if ( !params.height && !params.width ) {
+      return this;
+    }
+
+    // Calculate aspect ratio now, if possible
+    if ( params.height && params.width ) {
+      aspectRatio = params.width / params.height;
+    }
+
+    // Attach handler to load
+    // Handler is executed just once per element
+    // Load event required for Webkit browsers
+    return this.one( "load", function() {
+
+      // Remove all attributes and CSS rules
+      this.removeAttribute( "height" );
+      this.removeAttribute( "width" );
+      this.style.height = this.style.width = "";
+
+      var imgHeight = this.height
+        , imgWidth = this.width
+        , imgAspectRatio = imgWidth / imgHeight
+        , bxHeight = params.height
+        , bxWidth = params.width
+        , bxAspectRatio = aspectRatio;
+				
+      // Work the magic!
+      // If one parameter is missing, we just force calculate it
+      if ( !bxAspectRatio ) {
+        if ( bxHeight ) {
+          bxAspectRatio = imgAspectRatio + 1;
+        } else {
+          bxAspectRatio = imgAspectRatio - 1;
+        }
+      }
+
+      // Only resize the images that need resizing
+      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
+
+        if ( imgAspectRatio > bxAspectRatio ) {
+          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
+        } else {
+          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
+        }
+
+        this.height = bxHeight;
+        this.width = bxWidth;
+      }
+    })
+    .each(function() {
+
+      // Trigger load event (for Gecko and MSIE)
+      if ( this.complete || isIE6 ) {
+        $( this ).trigger( "load" );
+      }
+    });
+  };
+})( jQuery );
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js b/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js
new file mode 100644
index 000000000..16c30b123
--- /dev/null
+++ b/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js
@@ -0,0 +1 @@
+(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file