Merge remote-tracking branch 'origin/maint-v1.2'

Author: wichert

changes.md

@@ -40,6 +40,13 @@
 
 - Add a new [gallery](demo/gallery/index.html) pattern.
 
+
+## 1.2.1 - Released April 5, 2013
+
+- Fix use of an undeclared variable in the parser could result in problems
+  in IE8. This fixes
+  [Ticket 298](https://github.com/Patternslib/Patterns/issues/298).
+
 - Fix handling of trailing semicolons in the the argument parser. This fixes
   [Ticket 295](https://github.com/Patternslib/Patterns/issues/295).
 

package.json

@@ -45,7 +45,6 @@
             "jcrop",
             "jquery",
             "jquery.anythingslider",
-            "jquery.autosuggest",
             "jquery.chosen",
             "jquery.form",
             "jquery.fullcalendar",

src/pat/inject.js

@@ -251,9 +251,25 @@ define([
 
                     // perform injection
                     cfg.$target.each(function() {
+                        var $src;
+
+                        // $source.clone() does not work with shived elements in IE8
+                        if (document.all && document.querySelector &&
+                            !document.addEventListener) {
+                            $src = $source.map(function() {
+                                return $(this.outerHTML)[0];
+                            });
+                        } else {
+                            $src = $source.clone();
+                        }
+
                         var $target = $(this),
-                            $src = $source.clone(),
                             $injected = cfg.$injected || $src;
+
+                        $src.findInclusive('img').on('load', function() {
+                            $(this).trigger('pat-inject-content-loaded');
+                        });
+
                         if (_._inject($src, $target, cfg.action, cfg["class"])) {
                             $injected.filter(function() {
                                 // setting data on textnode fails in IE8
@@ -425,6 +441,14 @@ define([
                     $this.attr(attrName, value);
                 }
             });
+            // XXX: IE8 changes the order of attributes in html. The following
+            // lines move data-pat-inject-rebase-src to src.
+            $page.find('[data-pat-inject-rebase-src]').each(function() {
+                var $el = $(this);
+                $el.attr('src', $el.attr('data-pat-inject-rebase-src'))
+                   .removeAttr('data-pat-inject-rebase-src');
+            });
+
             return $page.html().replace(
                     /src="" data-pat-inject-rebase-/g, ''
                 ).trim();

src/pat/modal.js

@@ -2,8 +2,9 @@ define([
     "jquery",
     "../core/parser",
     "../registry",
+    "../utils",
     "./inject"
-], function($, Parser, registry, inject) {
+], function($, Parser, registry, utils, inject) {
     var parser = new Parser("modal");
 
     parser.add_argument("class");
@@ -66,17 +67,14 @@ define([
         },
 
         setPosition: function() {
-            // bail if repositioning already in progress
-            if ($('#pat-modal-clone').length > 0) {
+            var $el = $('div.pat-modal,#pat-modal');
+            if ($el.length === 0) {
                 return;
             }
 
-            var $el = $('div.pat-modal,#pat-modal'),
-                maxHeight = $(window).innerHeight() - $el.outerHeight(true) +
-                            $el.outerHeight();
-
-            if ($el.length === 0) {
-                return;
+            var $oldClone = $('#pat-modal-clone');
+            if ($oldClone.length > 0) {
+                $oldClone.remove();
             }
 
             var $clone = $el.clone();
@@ -86,35 +84,30 @@ define([
                 .css({
                     'visibility': 'hidden',
                     'position': 'absolute',
-                    'height': '',
-                    'max-height': maxHeight
+                    'height': ''
                 }).appendTo('body');
 
             // wait for browser to update DOM
             setTimeout(modal.measure, 0);
         },
 
         measure: function() {
+            var $clone = $('#pat-modal-clone');
+            if ($clone.length === 0) {
+                return;
+            }
+
             var $el = $('div.pat-modal,#pat-modal'),
-                $clone = $('#pat-modal-clone'),
                 maxHeight = $(window).innerHeight() - $clone.outerHeight(true) +
                             $clone.outerHeight(),
                 height = $clone.outerHeight();
 
             $clone.remove();
 
             if (maxHeight - height < 0) {
-                $el.addClass('max-height')
-                   .css({
-                       'height': maxHeight,
-                       'max-height': ''
-                   });
+                $el.addClass('max-height').css('height', maxHeight);
             } else {
-                $el.removeClass('max-height')
-                   .css({
-                       'height': '',
-                       'max-height': maxHeight
-                   });
+                $el.removeClass('max-height').css('height', '');
             }
 
             var top = ($(window).innerHeight() - $el.outerHeight(true)) / 2;
@@ -130,6 +123,8 @@ define([
     };
 
     $(window).on('resize.pat-modal-position', modal.setPosition);
+    $(window).on('pat-inject-content-loaded.pat-modal-position', '#pat-modal',
+        modal.setPosition);
     $(document).on('patterns-injected.pat-modal-position', '#pat-modal,div.pat-modal',
         modal.setPosition);