Merge master into release branch (2.0.13)

Author: jcbrand

.gitignore

@@ -54,3 +54,5 @@ src/pat/toggle/toggle.css
 src/pat/tooltip/tooltip.css
 src/pat/validate/validate.css
 src/pat/zoom/zoom.css
+/paternslib.sublime-project
+/paternslib.sublime-workspace

.travis.yml

@@ -1,12 +1,6 @@
 language: node_js
 node_js:
-- 0.8
-notifications:
-  irc:
-    channels:
-      - "irc.freenode.org#patterns"
-    on_success: change
-    on_failure: always
-    template:
-     - "%{branch}/%{commit} %{author} %{message}"
-     - "Build details: %{build_url}"
+- 0.10
+before_script: make stamp-bower
+script: make check
+sudo: false

Makefile

@@ -46,13 +46,13 @@ clean::
 ########################################################################
 ## Tests
 
-check:: jshint
 jshint: stamp-npm
 	$(JSHINT) --config jshintrc $(CHECKSOURCES)
 	$(JSHINT) --config jshintrc-tests $(TESTSOURCES)
 
 
-check:: stamp-npm
+.PHONY: check
+check:: stamp-bower jshint
 	$(PHANTOMJS) node_modules/phantom-jasmine/lib/run_jasmine_test.coffee tests.html
 
 
@@ -73,50 +73,50 @@ clean::
 
 all_css:: css
 	@echo "Hang tight!"
-	@$(SASS) src/pat/auto-scale/_auto-scale.scss src/pat/auto-scale/auto-scale.css
-	@$(SASS) src/pat/auto-submit/_auto-submit.scss src/pat/auto-submit/auto-submit.css
-	@$(SASS) src/pat/auto-suggest/_auto-suggest.scss src/pat/auto-suggest/auto-suggest.css
-	@$(SASS) src/pat/autofocus/_autofocus.scss src/pat/autofocus/autofocus.css
-	@$(SASS) src/pat/bumper/_bumper.scss src/pat/bumper/bumper.css
-	@$(SASS) src/pat/calendar/_calendar.scss src/pat/calendar/calendar.css
-	@$(SASS) src/pat/carousel/_carousel.scss src/pat/carousel/carousel.css
-	@$(SASS) src/pat/checked-flag/_checked-flag.scss src/pat/checked-flag/checked-flag.css
-	@$(SASS) src/pat/checklist/_checklist.scss src/pat/checklist/checklist.css
-	@$(SASS) src/pat/clone/_clone.scss src/pat/clone/clone.css
-	@$(SASS) src/pat/collapsible/_collapsible.scss src/pat/collapsible/collapsible.css
-	@$(SASS) src/pat/date-picker/_date-picker.scss src/pat/date-picker/date-picker.css
-	@$(SASS) src/pat/depends/_depends.scss src/pat/depends/depends.css
-	@$(SASS) src/pat/edit-tinymce/_edit-tinymce.scss src/pat/edit-tinymce/edit-tinymce.css
-	@$(SASS) src/pat/equaliser/_equaliser.scss src/pat/equaliser/equaliser.css
-	@$(SASS) src/pat/expandable-tree/_expandable-tree.scss src/pat/expandable-tree/expandable-tree.css
-	@$(SASS) src/pat/focus/_focus.scss src/pat/focus/focus.css
+	@$(SASS) -I . -I _sass src/pat/auto-scale/_auto-scale.scss src/pat/auto-scale/auto-scale.css
+	@$(SASS) -I . -I _sass src/pat/auto-submit/_auto-submit.scss src/pat/auto-submit/auto-submit.css
+	@$(SASS) -I . -I _sass src/pat/auto-suggest/_auto-suggest.scss src/pat/auto-suggest/auto-suggest.css
+	@$(SASS) -I . -I _sass src/pat/autofocus/_autofocus.scss src/pat/autofocus/autofocus.css
+	@$(SASS) -I . -I _sass src/pat/bumper/_bumper.scss src/pat/bumper/bumper.css
+	@$(SASS) -I . -I _sass src/pat/calendar/_calendar.scss src/pat/calendar/calendar.css
+	@$(SASS) -I . -I _sass src/pat/carousel/_carousel.scss src/pat/carousel/carousel.css
+	@$(SASS) -I . -I _sass src/pat/checked-flag/_checked-flag.scss src/pat/checked-flag/checked-flag.css
+	@$(SASS) -I . -I _sass src/pat/checklist/_checklist.scss src/pat/checklist/checklist.css
+	@$(SASS) -I . -I _sass src/pat/clone/_clone.scss src/pat/clone/clone.css
+	@$(SASS) -I . -I _sass src/pat/collapsible/_collapsible.scss src/pat/collapsible/collapsible.css
+	@$(SASS) -I . -I _sass src/pat/date-picker/_date-picker.scss src/pat/date-picker/date-picker.css
+	@$(SASS) -I . -I _sass src/pat/depends/_depends.scss src/pat/depends/depends.css
+	@$(SASS) -I . -I _sass src/pat/edit-tinymce/_edit-tinymce.scss src/pat/edit-tinymce/edit-tinymce.css
+	@$(SASS) -I . -I _sass src/pat/equaliser/_equaliser.scss src/pat/equaliser/equaliser.css
+	@$(SASS) -I . -I _sass src/pat/expandable-tree/_expandable-tree.scss src/pat/expandable-tree/expandable-tree.css
+	@$(SASS) -I . -I _sass src/pat/focus/_focus.scss src/pat/focus/focus.css
 	@echo "Almost there, don't give up!"
-	@$(SASS) src/pat/forward/_forward.scss src/pat/forward/forward.css
-	@$(SASS) src/pat/gallery/_gallery.scss src/pat/gallery/gallery.css
-	@$(SASS) src/pat/grid/_grid.scss src/pat/grid/grid.css
-	@$(SASS) src/pat/image-crop/_image-crop.scss src/pat/image-crop/image-crop.css
-	@$(SASS) src/pat/inject-history/_inject-history.scss src/pat/inject-history/inject-history.css
-	@$(SASS) src/pat/inject/_inject.scss src/pat/inject/inject.css
-	@$(SASS) src/pat/markdown/_markdown.scss src/pat/markdown/markdown.css
-	@$(SASS) src/pat/masonry/_masonry.scss src/pat/masonry/masonry.css
-	@$(SASS) src/pat/modal/_modal.scss src/pat/modal/modal.css
-	@$(SASS) src/pat/navigation/_navigation.scss src/pat/navigation/navigation.css
-	@$(SASS) src/pat/notification/_notification.scss src/pat/notification/notification.css
-	@$(SASS) src/pat/slideshow-builder/_slideshow-builder.scss src/pat/slideshow-builder/slideshow-builder.css
-	@$(SASS) src/pat/sortable/_sortable.scss src/pat/sortable/sortable.css
-	@$(SASS) src/pat/stacks/_stacks.scss src/pat/stacks/stacks.css
-	@$(SASS) src/pat/switch/_switch.scss src/pat/switch/switch.css
-	@$(SASS) src/pat/toggle/_toggle.scss src/pat/toggle/toggle.css
-	@$(SASS) src/pat/tooltip/_tooltip.scss src/pat/tooltip/tooltip.css
-	@$(SASS) src/pat/validate/_validate.scss src/pat/validate/validate.css
-	@$(SASS) src/pat/zoom/_zoom.scss src/pat/zoom/zoom.css
+	@$(SASS) -I . -I _sass src/pat/forward/_forward.scss src/pat/forward/forward.css
+	@$(SASS) -I . -I _sass src/pat/gallery/_gallery.scss src/pat/gallery/gallery.css
+	@$(SASS) -I . -I _sass src/pat/grid/_grid.scss src/pat/grid/grid.css
+	@$(SASS) -I . -I _sass src/pat/image-crop/_image-crop.scss src/pat/image-crop/image-crop.css
+	@$(SASS) -I . -I _sass src/pat/inject-history/_inject-history.scss src/pat/inject-history/inject-history.css
+	@$(SASS) -I . -I _sass src/pat/inject/_inject.scss src/pat/inject/inject.css
+	@$(SASS) -I . -I _sass src/pat/markdown/_markdown.scss src/pat/markdown/markdown.css
+	@$(SASS) -I . -I _sass src/pat/masonry/_masonry.scss src/pat/masonry/masonry.css
+	@$(SASS) -I . -I _sass src/pat/modal/_modal.scss src/pat/modal/modal.css
+	@$(SASS) -I . -I _sass src/pat/navigation/_navigation.scss src/pat/navigation/navigation.css
+	@$(SASS) -I . -I _sass src/pat/notification/_notification.scss src/pat/notification/notification.css
+	@$(SASS) -I . -I _sass src/pat/slideshow-builder/_slideshow-builder.scss src/pat/slideshow-builder/slideshow-builder.css
+	@$(SASS) -I . -I _sass src/pat/sortable/_sortable.scss src/pat/sortable/sortable.css
+	@$(SASS) -I . -I _sass src/pat/stacks/_stacks.scss src/pat/stacks/stacks.css
+	@$(SASS) -I . -I _sass src/pat/switch/_switch.scss src/pat/switch/switch.css
+	@$(SASS) -I . -I _sass src/pat/toggle/_toggle.scss src/pat/toggle/toggle.css
+	@$(SASS) -I . -I _sass src/pat/tooltip/_tooltip.scss src/pat/tooltip/tooltip.css
+	@$(SASS) -I . -I _sass src/pat/validate/_validate.scss src/pat/validate/validate.css
+	@$(SASS) -I . -I _sass src/pat/zoom/_zoom.scss src/pat/zoom/zoom.css
 	@echo "Done. Each pattern now has a CSS file."
 
-css::
-	@$(SASS) -I style -I . _sass/_patterns.scss style/patterns.css
+css:: stamp-bundler
+	@$(SASS) -I style -I _sass -I . _sass/_patterns.scss style/patterns.css
 
 watch:: 
-	$(SASS) --watch -I style -I . _sass/_patterns.scss:style/patterns.css
+	$(SASS) --watch -I style -I . -I _sass _sass/_patterns.scss:style/patterns.css
 
 ########################################################################
 
@@ -126,4 +126,4 @@ serve:: all
 
 designerhappy:: serve
 
-.PHONY: all bundle clean check jshint tests
+.PHONY: all bundle clean jshint tests

README.md

@@ -1,5 +1,7 @@
 # Patterns
 
+[![Build Status](https://travis-ci.org/Patternslib/Patterns.png?branch=master)](https://travis-ci.org/Patternslib/Patterns)
+
 Patterns is a toolkit 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
@@ -27,34 +29,38 @@ Other browser version may work too, but are not actively tested against.
 This will generate a `bundle.js` file which contains Patterns and all its
 dependencies.
 
+Alternatively, you can [download a bundle at patternslib.com](http://patternslib.com/download.html).
+
 ## Layout
 
-The individual patterns are located in their own folders in ./src/pat.
+The individual patterns are located in their own folders in `./src/pat/`.
 
 Each pattern folder contains some or all of the following files:
 
-- *index.html* which contains markup that shows a demonstration of the pattern.
-- *documentation.md* which is a Markdown file that documents each pattern's purpose,
-  how to use it and how to configure it.
+- *index.html* which contains HTML markup that shows a demonstration of the pattern.
+- *documentation.md* which is a Markdown file that documents the pattern's purpose, how to use it and how to configure it.
 - A javascript file which implements the pattern's functionality.
-- A Sass (.scss) file which provides CSS associated with the pattern.
+- A Sass (.scss) file which provides the CSS associated with the pattern.
 
 To generate CSS files from the pattern's included Sass files, type ``make all_css``
 and the css files will be generated in the same location as the Sass files.
 
-You'll need to has a Sass compiler installed.
+You'll need to have a Sass compiler installed.
 
 ## How to demo patterns
 
 To demo the patterns, simply type ``make serve`` to install the necessary
 dependencies and to start a simple Node.js HTTP server.
 
-You can then visit http://localhost:4001 to see the demo site.
+You can then visit http://localhost:4001 to see a site with demos.
+
+Alternatively, patterns can also be demoed through the
+[Patternslib.com](http://patternslib.com) website, which is open-source. The
+code and setup instructions are [here](https://github.com/patternslib/Patterns-site).
 
 ## Contributing fixes
 
-To develop on Patterns, clone the repository and set it's push-url to
-your fork:
+To develop on Patterns, clone the repository and set it's push-url to your fork:
 
     git remote set-url --push origin <url_to_your_fork>
 
@@ -72,3 +78,16 @@ The simplest way to run the tests are to use make:
     make check
 
 This will install all required npm and bower packages and run the tests.
+
+### Organisations and projects which use Patternslib
+
+- [Overstroom ik?](http://www.overstroomik.nl), a website which informs Dutch citizens of their risk of flooding. It was introduced and highly praised by the Dutch minister of infrastructure and environment, Melanie Schultz.
+- [OiRA](https://client.oiraproject.eu/), an online risk assessment tool, created for the Occupational Health and Safety Agency (OSHA) of the European Union.
+- [Staralliance](http://www.staralliance.com) uses Patternslib in their intranet.
+- [Plone](http://plone.com) CMS and [Plone Intranet project](http://ploneintranet.com) both use Patternslib.
+
+### Interactive HTML/CSS prototypes made with Patternslib
+
+- [The Plone Intranet prototype](http://prototype.ploneintranet.net/dashboard.html)
+- The [Patternslib.com](http://patternslib.com) website uses Patternslib and is based upon a prototype, which can be found [here](https://github.com/patternslib/Patterns-site).
+

RELEASE.md

@@ -1,6 +1,7 @@
 # Making a release
 
-Firstly, update the version number in bower.json, package.json and add the date to changes.md
+First, update the version number in bower.json, package.json, VERSION.txt and add the date to changes.md
+(remove the -dev from the version number in VERSION.txt)
 
 ## Merge master into the "release" branch
 
@@ -25,3 +26,5 @@ Firstly, update the version number in bower.json, package.json and add the date
 
     git tag 2.0.0
     git push && git push --tags
+
+## update VERSION.txt to the next logical version number and append '-dev' to it.

VERSION.txt

@@ -0,0 +1,2 @@
+// Patternslib 2.0.13
+

_sass/_mixins.scss

@@ -224,4 +224,4 @@
         background-color: $colour-warning;
         color: white;
     }
-}
+}

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "patternslib",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "main": "bundle.js",
   "devDependencies": {
     "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x"
@@ -13,7 +13,6 @@
     "requirejs": "",
     "requirejs-tpl-jcbrand": "*",
     "requirejs-text": "~2.0.12",
-    "klass": "",
     "jcrop": "0.9.12",
     "AnythingSlider": "1.8.17",
     "chosen": "https://github.com/syslabcom/chosen.git#4371e8fdabe16d4e8aaa3734421edc367e32a296",

build.js

@@ -5,6 +5,7 @@
     name: "almond",
     mainConfigFile: 'main.js',
     wrap: {
+        startFile: "VERSION.txt",
         endFile: "src/wrap-end.js"
     },
     optimize: "none",

changes.md

@@ -1,14 +1,28 @@
 # Changelog
 
+## 2.0.13 - Apr. 27, 2016
+
+- New property for sortable pattern, `drag-class`, the CSS class to apply to item being dragged. Is `"dragged"` by default.
+- New property for sortable pattern, `drop`, a Javascript callback function to be called when an item is dropped.
+- Form with pat-autosubmit doesn't get notified when injected inputs change.
+- Inject pattern with `autoload-visible` injected erroneously based upon old autoload element no longer in DOM.
+- Add the class `modal-active` to the `body` element whenever a modal is in the DOM.
+- New pattern: `pat-tabs`. See the relevant documentation.
+- Bugfix: `pat-validation` still validates removed clones from `pat-clone`.
+- Let the next-href option of pat-inject work as advertised.
+- Parser fix: don't treat `&` as a separator
+- #436 Remove `pat-bumper` restriction that scroll container must be the direct parent.
+- pat-masonry fix: the `containerStyle` value must be an object.
+
 ## 2.0.12 - Oct. 9, 2015
 
-- New argument for the inject pattern: `loading-class`.
+- New property 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`.
+- New propertys 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`.
+- New property 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`.