Merge master into release branch

Author: jcbrand

bower.json

@@ -27,6 +27,7 @@
     "parsleyjs": "1.1.18",
     "jquery.tinymce": "",
     "moment": "",
-    "moment-timezone": ""
+    "moment-timezone": "",
+    "imagesloaded": "~3.1.8"
   }
 }

build.js

@@ -27,12 +27,15 @@
         "Markdown.Converter": "legacy/Markdown.Converter",
         "Markdown.Extra": "legacy/Markdown.Extra",
         "Markdown.Sanitizer": "legacy/Markdown.Sanitizer",
-        "select2": "bower_components/select2/select2.min",
+        "imagesloaded":  "bower_components/imagesloaded/imagesloaded",
+        "eventEmitter/EventEmitter": "bower_components/eventEmitter/EventEmitter",
+        "eventie/eventie": "bower_components/eventie/eventie",
         "jquery.chosen": "bower_components/chosen/chosen/chosen.jquery",
         "jquery.fullcalendar": "bower_components/fullcalendar/fullcalendar.min",
         "jquery.fullcalendar.dnd": "bower_components/fullcalendar/lib/jquery-ui.custom.min",
         "jquery.placeholder": "bower_components/jquery-placeholder/jquery.placeholder.min",
         "jquery.textchange": "bower_components/jquery-textchange/jquery.textchange",
+        "select2": "bower_components/select2/select2.min",
         "tinymce": "bower_components/jquery.tinymce/jscripts/tiny_mce/jquery.tinymce",
         "spectrum": "bower_components/spectrum/spectrum",
 

bundle.js

@@ -1,9 +1,13 @@
 # Changelog
+ 
+## 2.0.5 - Dec. 4, 2014
+
+- #383 pat-equaliser sets the height to early
 
 ## 2.0.4 - Oct. 7, 2014
 
-- spectrum lib for colour picker now defaults to hsv values. Keep hex as 
-  default for backward compatibility, slc ref #9849
+- spectrum lib for colour picker now defaults to hsv values. Keep hex as default for backward compatibility (SLC ref 9849)
+- pat-inject autoload did not properly remove event handlers, so that they were called over and over. (SLC ref 10695)
 
 ## 2.0.3 - Sept. 22, 2014
 

changes.md

@@ -7,8 +7,9 @@ define([
     "jquery",
     "pat-registry",
     "pat-parser",
-    "pat-utils"
-], function($, patterns, Parser, utils) {
+    "pat-utils",
+    "imagesloaded"
+], function($, patterns, Parser, utils, imagesLoaded) {
     var parser = new Parser("equaliser");
     parser.add_argument("transition", "none", ["none", "grow"]);
     parser.add_argument("effect-duration", "fast");
@@ -25,7 +26,9 @@ define([
                 $container.data("pat-equaliser", options);
                 $container.on("pat-update.pat-equaliser", null, this, equaliser._onEvent);
                 $(window).on("resize.pat-equaliser", null, this, utils.debounce(equaliser._onEvent, 100));
-                equaliser._update(this);
+                imagesLoaded(this, $.proxy(function() {
+                    equaliser._update(this);
+                }, this));
             });
         },
 

src/pat/equaliser.js

@@ -50,7 +50,11 @@ define([
                         var $a = $(this),
                             $li = $a.parents("li:first"),
                             url = $a.attr("href"),
-                            path = _._pathfromurl(url);
+                            path;
+                        if (typeof url === "undefined") {
+                            return;
+                        }
+                        path = _._pathfromurl(url);
                         log.debug("checking url:", url, "extracted path:", path);
                         if (_._match(curpath, path)) {
                             log.debug("found match", $li);

src/pat/navigation.js

@@ -102,7 +102,7 @@ define([
                         victims=document.querySelectorAll(options[i].selector);
                         if (!victims.length)
                             continue;
-                        state=options[i].toggler.get(victims[0]),
+                        state=options[i].toggler.get(victims[0]);
                         last_state=options[i].value_storage.get();
                         if (state!==last_state && last_state !== null)
                             for (var j=0; j<victims.length; j++)

src/pat/toggle.js

@@ -480,7 +480,7 @@ define([
             case "t":
                 container_offset.top = trigger_box.bottom + tip_margin;
                 tip_offset.top = -23;
-                bottom_row = status.scroll.top + status.window.height,
+                bottom_row = status.scroll.top + status.window.height;
                 content_css["max-height"] = (bottom_row - container_offset.top - container_margin) + "px";
                 break;
             case "l":
@@ -551,13 +551,13 @@ define([
                             container_offset.top = trigger_center.top - container_margin;
                             tip_offset.top = 0;
                         }
-                        bottom_row = status.scroll.top + status.window.height,
+                        bottom_row = status.scroll.top + status.window.height;
                         content_css["max-height"] = (bottom_row - container_offset.top - container_margin) + "px";
                         break;
                     case "m":
                         if (options.height === "max") {
-                            container_offset.top = container_margin;
-                            bottom_row = status.scroll.top + status.window.height,
+                            container_offset.top = container_margin ;
+                            bottom_row = status.scroll.top + status.window.height;
                             content_css["max-height"] = (bottom_row - 2*container_margin) + "px";
                             tip_offset.top = trigger_box.top - container_margin;
                         } else {
@@ -568,7 +568,7 @@ define([
                     case "b":
                         if (options.height === "max") {
                             container_offset.top = 2*container_margin;
-                            bottom_row = status.scroll.top + status.window.height,
+                            bottom_row = status.scroll.top + status.window.height;
                             content_css.height = (bottom_row - 3*container_margin) + "px";
                             tip_offset.top = trigger_center.top - container_margin - tip_margin;
                         } else {

src/pat/tooltip.js

@@ -22,6 +22,9 @@
         "Markdown.Converter": "legacy/Markdown.Converter",
         "Markdown.Extra": "legacy/Markdown.Extra",
         "Markdown.Sanitizer": "legacy/Markdown.Sanitizer",
+        "imagesloaded":  "bower_components/imagesloaded/imagesloaded",
+        "eventEmitter/EventEmitter": "bower_components/eventEmitter/EventEmitter",
+        "eventie/eventie": "bower_components/eventie/eventie",
         "select2": "bower_components/select2/select2.min",
         "jquery.chosen": "bower_components/chosen/chosen/chosen.jquery",
         "jquery.fullcalendar": "bower_components/fullcalendar/fullcalendar.min",

test-build.js

@@ -15,13 +15,6 @@ define(["pat-equaliser"], function(pattern) {
                 jq.each.andReturn(jq);
                 expect(pattern.init(jq)).toBe(jq);
             });
-
-            it("Perform initial update", function() {
-                var $el = $("<div/>");
-                spyOn(pattern, "_update");
-                pattern.init($el);
-                expect(pattern._update).toHaveBeenCalledWith($el[0]);
-            });
         });
 
         describe("_update", function() {