Merge branch 'dev'

dmolsen · dmolsen · commit 35337b69ff9a · 2014-02-24T16:09:17.000-05:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.7.6
+ - FIX: pattern search now searches the entire name of a pattern
+ - FIX: the MQ menu lines up with the navigation item
+
 PL-v0.7.5
  - ADD: a quick pattern search using typeahead
  - ADD: keyboard shortcuts for a bunch of features using jwerty
@@ -24,6 +28,7 @@ PL-v0.7.5
  - 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
+ - THX: thanks to @aarongustafson for the idea to only load the JS when it's in the iframe
 
 PL-v0.7.2
  - FIX: proper support for Windows with the changes that happened in v0.7.0
diff --git a/core/lib/PatternLab/Builder.php b/core/lib/PatternLab/Builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.7.5
+ * Pattern Lab Builder Class - v0.7.6
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/lib/PatternLab/Configurer.php b/core/lib/PatternLab/Configurer.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Configurer Class - v0.7.5
+ * Pattern Lab Configurer Class - v0.7.6
  *
  * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/lib/PatternLab/Generator.php b/core/lib/PatternLab/Generator.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.7.5
+ * Pattern Lab Generator Class - v0.7.6
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/lib/PatternLab/Migrator.php b/core/lib/PatternLab/Migrator.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Migrator Class - v0.7.5
+ * Pattern Lab Migrator Class - v0.7.6
  *
  * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/lib/PatternLab/Watcher.php b/core/lib/PatternLab/Watcher.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Watcher Class - v0.7.5
+ * Pattern Lab Watcher Class - v0.7.6
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/core/styleguide/css/styleguide.css b/core/styleguide/css/styleguide.css
@@ -210,6 +210,9 @@
     position: absolute;
     left: auto;
     right: 0; }
+  .sg-acc-panel.sg-left {
+    position: absolute;
+    left: auto; }
 
 /* Controls (sizing, view mode) */
 .sg-controls {
diff --git a/core/styleguide/css/styleguide.scss b/core/styleguide/css/styleguide.scss
@@ -306,6 +306,11 @@ $animate-quick: 0.2s;
 		left: auto;
 		right: 0;
 	}
+	
+	&.sg-left {
+		position: absolute;
+		left: auto;
+	}
 }
 
 /* Controls (sizing, view mode) */
diff --git a/core/styleguide/css/vendor/typeahead.css b/core/styleguide/css/vendor/typeahead.css
@@ -10,7 +10,7 @@
 .typeahead,
 .tt-query,
 .tt-hint {
-  width: 396px;
+  width: 220px;
   height: 30px;
   padding: 8px 12px;
   font-size: 14px;
diff --git a/core/styleguide/js/pattern-finder.js b/core/styleguide/js/pattern-finder.js
@@ -26,8 +26,8 @@ var patternFinder = {
 		
 		// instantiate the bloodhound suggestion engine
 		var patterns = new Bloodhound({
-			datumTokenizer: function(d) { return Bloodhound.tokenizers.whitespace(d.patternPartial); },
-			queryTokenizer: Bloodhound.tokenizers.whitespace,
+			datumTokenizer: function(d) { return Bloodhound.tokenizers.nonword(d.patternPartial); },
+			queryTokenizer: Bloodhound.tokenizers.nonword,
 			limit: 10,
 			local: this.data
 		});
diff --git a/core/templates/partials/ishControls.mustache b/core/templates/partials/ishControls.mustache
@@ -17,18 +17,18 @@
 						{{^ ishControlsHide.random }}<li class="sg-half"><a href="#" id="sg-size-random">Random</a></li>{{/ ishControlsHide.random }}
 						{{^ ishControlsHide.disco }}<li class="sg-half"><a href="#" class="mode-link" id="sg-size-disco">Disco</a></li>{{/ ishControlsHide.disco }}
 						{{^ ishControlsHide.hay }}<li class="sg-half"><a href="#" class="mode-link" id="sg-size-hay">Hay!</a></li>{{/ ishControlsHide.hay }}
-						{{^ ishControlsHide.mqs }}
-						<li class="sg-half">
-							<a href="#" class="mode-link sg-acc-handle" id="sg-size-mq" title="Media query values found in stylesheet">MQ</a>
-							<ul class="sg-acc-panel sg-right" id="sg-mq">
-								{{# mqs }}
-									<li><a href="#">{{ . }}</a></li>
-								{{/ mqs }}
-							</ul>
-						</li>
-						{{/ ishControlsHide.mqs }}
 					</ul>
 				</li>
+				{{^ ishControlsHide.mqs }}
+				<li class="sg-half">
+					<a href="#" class="mode-link sg-acc-handle" id="sg-size-mq" title="Media query values found in stylesheet">MQ</a>
+					<ul class="sg-acc-panel sg-left" id="sg-mq">
+						{{# mqs }}
+							<li><a href="#">{{ . }}</a></li>
+						{{/ mqs }}
+					</ul>
+				</li>
+				{{/ ishControlsHide.mqs }}
 				{{^ ishControlsHide.find }}
 				<li class="sg-find">
 					<a href="#" class="sg-acc-handle sg-control-trigger sg-icon icon-search" id="sg-f-toggle" title="Find stuff"><span class="is-vishidden">F</span></a>
diff --git a/public/styleguide/css/styleguide.css b/public/styleguide/css/styleguide.css
@@ -210,6 +210,9 @@
     position: absolute;
     left: auto;
     right: 0; }
+  .sg-acc-panel.sg-left {
+    position: absolute;
+    left: auto; }
 
 /* Controls (sizing, view mode) */
 .sg-controls {
diff --git a/public/styleguide/css/styleguide.scss b/public/styleguide/css/styleguide.scss
@@ -306,6 +306,11 @@ $animate-quick: 0.2s;
 		left: auto;
 		right: 0;
 	}
+	
+	&.sg-left {
+		position: absolute;
+		left: auto;
+	}
 }
 
 /* Controls (sizing, view mode) */
diff --git a/public/styleguide/css/vendor/typeahead.css b/public/styleguide/css/vendor/typeahead.css
@@ -10,7 +10,7 @@
 .typeahead,
 .tt-query,
 .tt-hint {
-  width: 396px;
+  width: 220px;
   height: 30px;
   padding: 8px 12px;
   font-size: 14px;
diff --git a/public/styleguide/js/pattern-finder.js b/public/styleguide/js/pattern-finder.js
@@ -26,8 +26,8 @@ var patternFinder = {
 		
 		// instantiate the bloodhound suggestion engine
 		var patterns = new Bloodhound({
-			datumTokenizer: function(d) { return Bloodhound.tokenizers.whitespace(d.patternPartial); },
-			queryTokenizer: Bloodhound.tokenizers.whitespace,
+			datumTokenizer: function(d) { return Bloodhound.tokenizers.nonword(d.patternPartial); },
+			queryTokenizer: Bloodhound.tokenizers.nonword,
 			limit: 10,
 			local: this.data
 		});

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`/*!`
`4`		`- * Pattern Lab Builder Class - v0.7.5`
	`4`	`+ * Pattern Lab Builder Class - v0.7.6`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com`
`7`	`7`	`* Licensed under the MIT license`
Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,11 @@ $animate-quick: 0.2s;`
`306`	`306`	`left: auto;`
`307`	`307`	`right: 0;`
`308`	`308`	`}`
	`309`	`+`
	`310`	`+ &.sg-left {`
	`311`	`+ position: absolute;`
	`312`	`+ left: auto;`
	`313`	`+ }`
`309`	`314`	`}`
`310`	`315`
`311`	`316`	`/* Controls (sizing, view mode) */`