Merge master into release branch

Author: pilz

RELEASE.md

@@ -27,4 +27,36 @@ First, update the version number in bower.json, package.json, VERSION.txt and ad
     git tag 2.0.0
     git push && git push --tags
 
-## update VERSION.txt to the next logical version number and append '-dev' to it.
+## checkout master, update VERSION.txt to the next logical version number and append '-dev' to it.
+
+## Create the release in github
+
+- Go to https://github.com/Patternslib/Patterns/releases/
+- Click the new tag
+- Click "Edit tag"
+- Add a Title, e.g. "2.0.14 - Aug 15, 2016"
+- Copy the corresponding changelog part into the body field
+- Finally click "Publish release"
+
+## Release to npmjs.org
+
+Run:
+
+- npm login
+- npm version <update_type> 
+  where update_type is patch, minor or major. See https://docs.npmjs.com/getting-started/publishing-npm-packages.
+- npm publish
+
+
+## Now contact support@syslab.com and request an update of the patternslib.com site as well.
+
+This is done as follows:
+
+- Log into patternslib.syslab.com
+
+    sudo -iu patternslib
+    cd Patterns-site
+    cd patternslib
+    git pull
+    make clean && make bundle
+

VERSION.txt

@@ -1,2 +1,2 @@
-// Patternslib 2.1.0
+// Patternslib 2.1.1-dev
 

changes.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.1.1 - Aug. 28, 2017
+
+- pat-modal: Only add a panel-header to the first panel-content element within pat-modal, not everyone. Otherwise this may collide with pat-collapsible which also creates a panel-content class further down the DOM (pilz)
+- pat-modal: Fix an issue where chrome is so quick that a modal is closed before the actual injection call can be sent. 
+
 ## 2.1.0 - Jun. 26, 2017
 
 - pat-gallery: Also include the node with the ``pat-gallery`` class trigger for initializing the gallery.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "patternslib",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "title": "Markup patterns to drive behaviour.",
   "description": "Patternslib is a JavaScript library that enables designers to build rich interactive prototypes without the need for writing any Javascript. All events are triggered by classes and other attributes in the HTML, without abusing the HTML as a programming language. Accessibility, SEO and well structured HTML are core values of Patterns.",
   "author": {

src/pat/collapsible/collapsible.js

@@ -58,7 +58,7 @@ define([
                 return;
             }
 
-            this.$panel = $el.find(".panel-content");
+            this.$panel = $el.children(".panel-content");
             if (this.$panel.length === 0) {
                 if ($content.length) {
                     this.$panel = $content

src/pat/modal/modal.js

@@ -64,7 +64,7 @@ define([
             } else {
                 this.$el.append("<div class='panel-content' />");
             }
-            $(".panel-content", this.$el).before($header);
+            this.$el.children(".panel-content").before($header);
             this.$el.children(this.options.panelHeaderContent).prependTo($header);
 
             // Restore focus in case the active element was a child of $el and
@@ -147,12 +147,23 @@ define([
                 utils.redraw(this.$el.find(".panel-body"));
             }
         },
-
         destroy: function() {
-            $(document).off(".pat-modal");
-            this.$el.remove();
-            $('body').removeClass("modal-active");
-        }
+            var $el = this.$el;
+            if ($el.find('form').hasClass('pat-inject') ) {
+                // if pat-inject in modal form, listen to patterns-inject-triggered and destroy first
+                // once that has been triggered
+                $('body').on( "patterns-inject-triggered", function() {
+                    $(document).off(".pat-modal");
+                    $el.remove();
+                    $('body').removeClass("modal-active");                
+                });
+            } else {
+                // if working without injection, destroy right away.
+                $(document).off(".pat-modal");
+                $el.remove();
+                $('body').removeClass("modal-active");                
+            }
+        }   
     });
 });