Merge branch 'dev'

Author: dmolsen

CHANGELOG

@@ -1,5 +1,30 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.7.5
+ - ADD: a quick pattern search using typeahead
+ - ADD: keyboard shortcuts for a bunch of features using jwerty
+ - ADD: using cmd+a/ctrl+a when in code view selects the contents of the currently active tab
+ - ADD: code and annotation views can be opened automatically on load via query string params
+ - ADD: can use the config to remove items from pattern nav
+ - ADD: check for json support now that certain flavors of PHP 5.5.3 don't come with it
+ - ADD: can use boolean vars to enable/disable sections via pattern parameters
+ - ADD: pattern states for tracking progress on individual patterns
+ - FIX: updated icomoon icons
+ - FIX: code view has tabs
+ - FIX: code view shows mustache versions of a pattern
+ - FIX: patterns are properly sorted in style guide and view all views
+ - FIX: pattern lab-specific JS & CSS is only loaded when in the iframe
+ - FIX: classlist polyfill for better IE9 support
+ - FIX: stringified the postmessage messages for better IE9 support
+ - FIX: make sure history is only used by browsers that support it (e.g. IE9 doesn't)
+ - FIX: using watcher-launched auto-reload server now works on Windows
+ - FIX: various bugs with lineage
+ - FIX: vendored third-party JS and CSS
+ - FIX: infinite refresh bug squashed
+ - THX: thanks to @joshrcook for some styling fixes and hitting on the cause of the start-up issues on ubuntu
+ - THX: thanks to @tylersticka for lots of ideas: pattern states, cmd+a, boolean pattern parameters and the feedback on the watcher
+ - THX: thanks to @nikvm for the fix for properly sorting the styleguide view
+
 PL-v0.7.2
  - FIX: proper support for Windows with the changes that happened in v0.7.0
  - THX: thanks to @chriskevin and @MattKohnen for reporting the issue

core/builder.php

@@ -27,6 +27,12 @@
  *
  */
 
+// check to see if json_decode exists. might be disabled in installs of PHP 5.5
+if (!function_exists("json_decode")) {
+	print "Please check that your version of PHP includes the JSON extension. It's required for Pattern Lab to run. Aborting.\n";
+	exit;
+}
+
 // auto-load classes
 require(__DIR__."/lib/SplClassLoader.php");
 

core/config/config.ini.default

@@ -3,7 +3,7 @@
  * If config.ini doesn't exist Pattern Lab will try to create a new version
  */
 
-v  = "0.7.2"
+v  = "0.7.5"
 
 // file extensions to ignore when building or watching the source dir, separate with a comma
 ie = "scss,DS_Store,less"
@@ -20,3 +20,9 @@ cleanPublic = "true"
 
 // pattern lab's xip host if you have it configured
 xipHostname = "http://patternlab.*.xip.io"
+
+// which, if any, controls to hide in the nav
+ishControlsHide = ""
+
+// the order of pattern states
+patternStates = "inprogress,inreview,complete"

core/lib/Mustache/Loader/PatternLoader.php

@@ -89,7 +89,8 @@ public function load($name)
             }
         }
 
-        return $this->templates[$name];
+        return (isset($this->templates[$name])) ? $this->templates[$name] : false;
+        
     }
 
     /**
@@ -243,8 +244,16 @@ protected function getPartialInfo($partial)
      */
     private function findReplaceParameters($fileData, $parameters)
     {
-        foreach ($parameters as $k => $v) { 
-            $fileData = preg_replace('/{{([\s]*'.$k .'[\s]*)}}/', $v, $fileData);
+        foreach ($parameters as $k => $v) {
+            if ($v == "true") {
+               $fileData = preg_replace('/{{\#([\s]*'.$k .'[\s]*)}}(.*?){{\/([\s]*'.$k .'[\s]*)}}/s','$2',$fileData); // {{# asdf }}STUFF{{/ asdf}}
+               $fileData = preg_replace('/{{\^([\s]*'.$k .'[\s]*)}}(.*?){{\/([\s]*'.$k .'[\s]*)}}/s','',$fileData); // {{^ asdf }}STUFF{{/ asdf}}
+            } else if ($v == "false") {
+               $fileData = preg_replace('/{{\^([\s]*'.$k .'[\s]*)}}(.*?){{\/([\s]*'.$k .'[\s]*)}}/s','$2',$fileData); // {{# asdf }}STUFF{{/ asdf}}
+               $fileData = preg_replace('/{{\#([\s]*'.$k .'[\s]*)}}(.*?){{\/([\s]*'.$k .'[\s]*)}}/s','',$fileData); // {{^ asdf }}STUFF{{/ asdf}}
+            } else {
+               $fileData = preg_replace('/{{([\s]*'.$k .'[\s]*)}}/', $v, $fileData); // {{ asdf }}
+            }
         }
         return $fileData;
     }