Merge branch 'master' into release

Author: pilz

bower.json

@@ -16,7 +16,7 @@
     "AnythingSlider": "1.8.17",
     "chosen": "0.9.11",
     "jquery-form": "3.46.0",
-    "fullcalendar": "http://arshaw.com/fullcalendar/downloads/fullcalendar-2.0.0.zip",
+    "fullcalendar": "https://github.com/arshaw/fullcalendar/releases/download/v2.0.0/fullcalendar-2.0.0.zip",
     "jquery-placeholder": "2.0.7",
     "prefixfree": "",
     "select2": "3.4.3",

changes.md

@@ -4,7 +4,7 @@
 
 - #377 Local inject doesn't work for IE10 and 11
 - #378 pat-switch detecting click on container of link prevent default on anchor
-- #379 Local inject doesn't work for IE10 and 11
+- #379 pat-checklist selectAll/deselectAll only works inside .pat-checklist element
 
 
 ## 2.0.1 - Sept. 2, 2014

src/pat/inject.js

@@ -558,7 +558,7 @@ define([
             if ($scrollable.length) {
                 // if scrollable parent and visible -> trigger it
                 // we only look at the closest scrollable parent, no nesting
-                checkVisibility = function inject_checkVisibility_scrollable() {
+                checkVisibility = utils.debounce(function inject_checkVisibility_scrollable() {
                     if ($el.data("patterns.autoload"))
                         return false;
                     var reltop = $el.offset().top - $scrollable.offset().top - 1000,
@@ -571,28 +571,28 @@ define([
                         return trigger();
                     }
                     return false;
-                };
+                }, 100);
                 if (checkVisibility())
                     return true;
 
                 // wait to become visible - again only immediate scrollable parent
-                $($scrollable[0]).on("scroll", utils.debounce(checkVisibility, 100));
-                $(window).on("resize.pat-autoload", utils.debounce(checkVisibility, 100));
+                $($scrollable[0]).on("scroll", checkVisibility);
+                $(window).on("resize.pat-autoload", checkVisibility);
             } else {
                 // Use case 2: scrolling the entire page
-                checkVisibility = function inject_checkVisibility_not_scrollable() {
+                checkVisibility = utils.debounce(function inject_checkVisibility_not_scrollable() {
                     if ($el.data("patterns.autoload"))
                         return false;
                     if (!utils.elementInViewport($el[0]))
                         return false;
 
                     $(window).off(".pat-autoload", checkVisibility);
                     return trigger();
-                };
+                }, 100);
                 if (checkVisibility())
                     return true;
                 $(window).on("resize.pat-autoload scroll.pat-autoload",
-                        utils.debounce(checkVisibility, 100));
+                        checkVisibility);
             }
             return false;
         },

src/pat/tooltip.js

@@ -213,12 +213,15 @@ define([
             var $trigger = event.data,
                 $container = tooltip.getContainer($trigger),
                 namespace = $container.attr("id");
-            $container.css("visibility", "hidden");
-            $container.parents().add(window).off("." + namespace);
-            tooltip.removeHideEvents($trigger);
-            tooltip.setupShowEvents($trigger);
-            $trigger.removeClass("active").addClass("inactive");
-            $trigger.trigger("pat-update", {pattern: "tooltip", hidden: true});
+            // when another tooltip trigger is clicked, only close the previous tooltip if it does not contain the trigger
+            if (event.type !== "pat-tooltip-click" || $container.has(event.target).length <= 0) {
+                $container.css("visibility", "hidden");
+                $container.parents().add(window).off("." + namespace);
+                tooltip.removeHideEvents($trigger);
+                tooltip.setupShowEvents($trigger);
+                $trigger.removeClass("active").addClass("inactive");
+                $trigger.trigger("pat-update", {pattern: "tooltip", hidden: true});
+            }
         },
 
         onDestroy: function(event) {

tests/specs/pat/tooltip.js

@@ -252,6 +252,43 @@ define(["pat-tooltip", "pat-inject"], function(pattern, inject) {
                 });
             });
         });
+
+        describe("A tooltip that opens on click and contains another tooltip trigger", function () {
+            beforeEach(function() {
+                utils.createTooltip({
+                    data: "trigger: click; source: content",
+                    href: "#tooltip-content"
+                });
+                $("<div />", {
+                    "id":   "tooltip-content"
+                }).appendTo($("div#lab"));
+                $("<a/>", {
+                    "id":   "nested-tooltip",
+                    "href": "#nested-tooltip-content",
+                    "title": "nested tooltip title attribute",
+                    "data-pat-tooltip": "trigger: click; source: content",
+                    "class": "pat-tooltip"
+                }).appendTo($("div#tooltip-content"));
+            });
+            afterEach(function() {
+                utils.removeTooltip();
+            });
+            it("will not close if the contained trigger is clicked", function () {
+                runs(function () {
+                    spyOn(pattern, "show").andCallThrough();
+                    var $el = $("a#tooltip");
+                    pattern.init($el);
+                    pattern.init($("a#nested-tooltip"));
+                    $el.trigger(utils.click);
+                    expect(pattern.show).toHaveBeenCalled();
+                });
+                waits(100); // hide events get registered 50 ms after show
+                runs(function () {
+                    $(".tooltip-container a#nested-tooltip").trigger(utils.click);
+                    expect($(".tooltip-container a#nested-tooltip").css("visibility")).toBe("visible");
+                });
+            });
+        });
     });
 });
 // jshint indent: 4, browser: true, jquery: true, quotmark: double