Merge pull request #67 from matt-curtis/development

1.7.1

Fluid.sketchplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
+	<string>14F1505</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B1005</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A278</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0711</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7B1005</string>
+	<string>7C68</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Matt. All rights reserved.</string>
 </dict>

Fluid.sketchplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/Resources/MCSketchPluginFramework.framework/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
+	<string>14F1505</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B1005</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A278</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0711</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7B1005</string>
+	<string>7C68</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Matt. All rights reserved.</string>
 </dict>

Fluid.sketchplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/Resources/MCSketchPluginFramework.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
+	<string>14F1505</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B1005</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A278</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0711</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7B1005</string>
+	<string>7C68</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Matt. All rights reserved.</string>
 </dict>

Fluid.sketchplugin/Contents/Resources/MCSketchConstraints.bundle/Contents/Resources/MCSketchPluginFramework.framework/Versions/Current/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
+	<string>14F1505</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B1005</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A278</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0711</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7B1005</string>
+	<string>7C68</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Matt. All rights reserved.</string>
 </dict>

Fluid.sketchplugin/Contents/Sketch/commands.js

@@ -5,37 +5,37 @@
 //	--------
 
 $.commands.createCommand("toggleToolbarVisiblity", function(ctx){
-	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
+	var pluginController = getPluginController(ctx);
 
 	pluginController.toggleToolbarVisiblity();
 });
 
 $.commands.createCommand("editConstraints", function(ctx){
-	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
+	var pluginController = getPluginController(ctx);
 
 	pluginController.showConstraintInspector();
 });
 
 $.commands.createCommand("updateLayout", function(ctx){
-	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
+	var pluginController = getPluginController(ctx);
 
 	pluginController.updateLayout();
 });
 
 $.commands.createCommand("preview", function(ctx){
-	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
+	var pluginController = getPluginController(ctx);
 
 	pluginController.preview();
 });
 
 $.commands.createCommand("toggleArtboardSize", function(ctx){
-	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
+	var pluginController = getPluginController(ctx);
 
 	pluginController.showArtboardSizePresetsPopover();
 });
 
 $.commands.createCommand("showSettingsWindow", function(ctx){
-	var pluginController = [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
+	var pluginController = getPluginController(ctx);
 
 	pluginController.showSettingsWindow();
 });

Fluid.sketchplugin/Contents/Sketch/main.js

@@ -9,4 +9,10 @@ if($.runtime.classExists("MCFluidPluginController") == false){
 		Note to self and whoever else reads these (say hi on twitter :) special word: efficacy):
 		A more robust method for detecting/identifying the existing plugin in the runtime is needed...
 	*/
-}
+}
+
+//	Controller
+
+var getPluginController = function(ctx){
+	return [MCFluidPluginController pluginController:ctx.plugin pluginCommand:ctx.command];
+};

Fluid.sketchplugin/Contents/Sketch/manifest.json

@@ -3,7 +3,7 @@
 	"description": "Auto Layout-like constraints in Sketch",
 	"author": "Matt Curtis",
 	"homepage": "https://github.com/matt-curtis/Fluid-for-Sketch",
-	"version": "1.7",
+	"version": "1.7.1",
 
 	"identifier": "com.matt-curtis.sketch.constraints",
 	"updateURL": "https://raw.githubusercontent.com/matt-curtis/Fluid-for-Sketch/master/Fluid.sketchplugin/Contents/Sketch/manifest.json",

README.md

@@ -1,10 +1,10 @@
-# :droplet: Fluid for Sketch 1.7
+# :droplet: Fluid for Sketch 1.7.1
 
 > *A collaborative project brought to you by [Matt Curtis](https://twitter.com/matt_sven) & [Cat Noone](https://twitter.com/imcatnoone)*
 
 Fluid is a Sketch plugin that provides a means to create more constraint-based, responsive designs. It is based on Auto Layout constraints.
 
-:package: [Download Plugin (.zip)](https://github.com/matt-curtis/Fluid-for-Sketch/releases/download/v1.7/Fluid.sketchplugin.zip) | :star: [Changelog](https://github.com/matt-curtis/Fluid-for-Sketch/releases) | :arrow_down: [Download the Demo Sketch Document](https://github.com/matt-curtis/Fluid-for-Sketch/raw/master/Constraint%20Demos.sketch)
+:package: [Download Plugin (.zip)](https://github.com/matt-curtis/Fluid-for-Sketch/releases/download/v1.7.1/Fluid.sketchplugin.zip) | :star: [Changelog](https://github.com/matt-curtis/Fluid-for-Sketch/releases) | :arrow_down: [Download the Demo Sketch Document](https://github.com/matt-curtis/Fluid-for-Sketch/raw/master/Constraint%20Demos.sketch)
 --- | --- | ---
 
 --