Merge master into release branch

Author: jcbrand

_sass/_mixins.scss

@@ -2,9 +2,15 @@
   @if $media == small {
     @media only screen and (max-width: $break-small) { @content; }
   }
+  @else if $media == small-medium {
+    @media only screen and (max-width: $break-large -1) { @content; }
+  }
   @else if $media == medium {
     @media only screen and (min-width: $break-small + 1) and (max-width: $break-large - 1) { @content; }
   }
+  @else if $media == medium-large {
+    @media only screen and (min-width: $break-small + 1) { @content; }
+  }
   @else if $media == large {
     @media only screen and (min-width: $break-large) { @content; }
   }

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "patternslib",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "main": "bundle.js",
   "devDependencies": {
     "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x"

changes.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 2.0.12 - Oct. 9, 2015
+
+- New argument for the inject pattern: `loading-class`.
+  Specifies a class to appear on the injection target while the injected content is still loading.
+  Previously this was hardcoded to `injecting`, this is still set to the default value.
+- New arguments for the inject pattern: `confirm` and `confirm-message`.
+  Allows you to specify whether a confirmation message should be shown before
+  injecting, as well as the text of that message.
+- New argument for tooltip pattern: `mark-inactive`.
+  A boolean value, used to specify whether the class 'inactive' should be added
+  to the tooltip trigger. Previously this behavior was hardcoded, now it's
+  optional with a default of `true`.
+- Fix: tooltips with `closing` set to `sticky` or `auto` couldn't be closed on mobile.
+- Parser fix. Remove duplicate configurations.
+- Bugfix: TypeError: Cannot read property 'msie' of undefined.
+
 ## 2.0.11 - Sept. 30, 2015
 
 - Bugfix. Specifying combined pattern properties (with &&) not working on IE10.

docs/developer/create-a-pattern.md

@@ -1,12 +1,14 @@
 # How to create a new pattern
 
-This section provides a quick tutorial on how to create a new Patternslib pattern.
+This document provides a quick tutorial on how to create a new Patternslib pattern.
 Patterns are implemented as javascript objects that are registered with the Patternslib library.
 
-We create a new pattern called pat-colorchanger, which will change
-the text-color of an element after waiting for 3 seconds.
+## Creating a colorchanger pattern
 
-## Creating the pattern directory
+In this tutorial we will create a new pattern called pat-colorchanger.
+This pattern changes the text-color of an element after waiting for 3 seconds.
+
+### Creating the pattern directory
 
 To start off, lets create a new directory in which we'll put our pattern's
 files, and then lets navigate into it.
@@ -16,6 +18,17 @@ mkdir pat-colorchanger
 cd pat-colorchanger
 ```
 
+### Using the Yeoman generator
+
+Instead of manually typing out the code shown in this tutorial, you can simply
+use the [Yeoman Patternslib generator](https://www.npmjs.com/package/generator-patternslib) to generate the appropriate skeleton for you.
+
+To do so, simply run the following commands in side the `pat-colorchanger`
+directory you created in the previous section.
+
+    sudo npm install -g generator-patternslib
+    yo patternslib pat-colorchanger
+
 In our example we're creating for demonstration purposes the pattern
 pat-colorchanger, but you'll of course choose a more appropriate
 name for your own pattern.
@@ -26,11 +39,10 @@ Each pattern should have a certain layout. Look for example at [pat-pickadate](h
 There is one subdirectory, called *src*, inside the *pat-pickadate* repository.
 It contains the pattern's actual Javascript source file(s).
 
-Let's create this directory now::
-
-    mkdir src
+The Yeoman generator will create the correct layout and all the necessary
+files.
 
-And let's also create the files required::
+However, if you're doing this manually instead of using Yeoman, then create this directory as well as the files required:
 
     touch README.md index.html src/pat-colorchanger.js
 
@@ -39,7 +51,7 @@ And let's also create the files required::
 
 Patterns are configured via a declarative HTML syntax.
 
-A particular pattern is usually invoked by specifying its name as an HTML class on a DOM object.
+Usually a particular pattern is invoked by specifying its name as an HTML class on a DOM object.
 The invoked pattern then acts upon that specifc DOM element. In our example case, the pattern
 changes the text color after 3 seconds. This color change is applied to the DOM
 element on which the pattern is declared.
@@ -51,11 +63,9 @@ So in our case, that's `data-pat-colorchanger`.
 
 For example:
 
-```
-<p class="pat-colorchanger" data-pat-colorchanger="color: blue" style="color: red">
-    This text will turn from red into blue after 3 seconds.
-</p>
-```
+    <p class="pat-colorchanger" data-pat-colorchanger="color: blue" style="color: red">
+        This text will turn from red into blue after 3 seconds.
+    </p>
 
 HTML markup as shown above, which illustrates how your pattern functions, should be put
 inside the `index.html` file. This file can then be used by designers and integrators
@@ -144,8 +154,7 @@ Put this code into `./src/pat-colorchanger.js`
 }));
 ```
 
-This pattern can be loaded directly in your browser after a standard Patterns
-bundle has been loaded.
+This pattern can be loaded directly in your browser after a standard Patterns bundle has been loaded.
 
 ```
 <html>

docs/developer/parser.md

@@ -1,15 +1,15 @@
 # The argument parser's API
 
-Many patterns can be configured to change their behaviour. This is done
+Patterns can usually be configured to change their behaviour. This is done
 by passing arguments to the parser in data-pat-\* attributes or by using
 an internal javascript API. All processing of arguments is done by the
 argument parser. Using the parser is easy:
 
 ```
 var parser = new ArgumentParser("tooltip");
-parser.add_argument("delay", 150);
-parser.add_argument("loop", false);
-parser.add_argument("next-label", "Next");
+parser.addArgument("delay", 150);
+parser.addArgument("loop", false);
+parser.addArgument("next-label", "Next");
 
 $("[data-pat-tooltip]").each(function() {
     var options = parser.parse($(this));
@@ -41,7 +41,7 @@ they are:
    right attribute to parse for elements.
 
 
-- **ArgumentParser.add_argument(name[, default[, choices[, multiple]]])**
+- **ArgumentParser.addArgument(name[, default[, choices[, multiple]]])**
 
     Parameters:
     - **name** *(String)*: argument name
@@ -61,7 +61,7 @@ they are:
     The default value can also be a function taking a jQuery wrapped element
     and the parameter name as arguments and which returns a default value.
 
-        parser.add_argument("delay", function($el, name) {
+        parser.addArgument("delay", function($el, name) {
             return 500;
         });
 
@@ -80,10 +80,10 @@ they are:
     options will be returned as a sub-object. For example a parser with
     these arguments:
 
-        parser.add_argument("selector", ".pattern");
-        parser.add_argument("control-arrows", false);
-        parser.add_argument("control-links", true);
-        parser.add_argument("control-index", false);
+        parser.addArgument("selector", ".pattern");
+        parser.addArgument("control-arrows", false);
+        parser.addArgument("control-links", true);
+        parser.addArgument("control-index", false);
 
     will return an object like this:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "patternslib",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "title": "Markup patterns to drive behaviour.",
   "description": "Patterns 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": {
@@ -12,34 +12,33 @@
       "URL": "LICENSE.txt"
     }
   ],
-  "dependencies": {
-    "http-server": "^0.7.5"
-  },
   "devDependencies": {
     "bower": "latest",
     "generator-patternslib": "0.2.1",
+    "http-server": "^0.7.5",
     "jshint": "~0.9.1",
     "pegjs": "0.7.0",
     "phantom-jasmine": "0.1.8",
-    "phantomjs": "^1.9.12",
+    "phantomjs": "^1.9.18",
     "requirejs": "",
     "yo": "^1.4.8"
   },
   "homepage": "https://gitub.com/Patternslib/Patterns",
   "docs": "http://patternslib.com/",
   "maintainers": [
-    {
-      "name": "Wichert Akkerman",
-      "email": "wichert@wiggy.net",
-      "url": "http://www.wiggy.net"
-    },
     {
       "name": "Cornelis Kolbach",
       "url": "http://cornae.com"
     },
     {
-      "name": "Florian Friesdorf",
-      "email": "flo@chaoflow.net"
+      "name": "JC Brand",
+      "email": "jc@opkode.com",
+      "url": "https://www.opkode.com"
+    },
+    {
+      "name": "Syslab.com GmbH",
+      "email": "info@syslab.com",
+      "url": "http://www.syslab.com"
     }
   ]
 }