Merge pull request #10 from nolastan/modal-fixes

Modal fixes
nolastan · Feb 5, 2016 · 8b6e081 · 8b6e081
2 parents 3332bee + e5e6a5c
commit 8b6e081
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Contents/Sketch/manifest.json b/Contents/Sketch/manifest.json
@@ -4,7 +4,7 @@
     {
       "script" : "script.cocoascript",
       "handler" : "onRun",
-      "shortcut" : "option s",
+      "shortcut" : "ctrl shift s",
       "name" : "Sync",
       "identifier" : "sync"
     },
@@ -16,7 +16,7 @@
     ],
   },
   "identifier" : "com.github.nolastan.sync",
-  "version" : "1.1",
+  "version" : "1.2",
   "description" : "Sync styles and symbols",
   "authorEmail" : "nolastan@gmail.com",
   "name" : "Sync"

diff --git a/Contents/Sketch/script.cocoascript b/Contents/Sketch/script.cocoascript
@@ -6,11 +6,12 @@ var onRun = function(context) {
   var doc = context.document;
   var dict = NSThread.mainThread().threadDictionary();
 
-  showOptions();
-  loadFromURL(dict['syncSource']);
+  if (showOptions() == NSAlertDefaultReturn) {
+    loadFromURL(dict['syncSource']);
 
-  doc.showMessage('Sync complete!');
-  doc.reloadInspector();
+    doc.showMessage('Sync complete!');
+    doc.reloadInspector();
+  }
 
   function loadFromURL(queryURL) {
     var data;
@@ -69,18 +70,18 @@ var onRun = function(context) {
   }
 
   function showOptions() {
-    var alert = [NSAlert alertWithMessageText: "Sync text styles"
-                                   defaultButton:"Sync"
+    var alert = [NSAlert alertWithMessageText: "Replace styles and colors"
+                                   defaultButton:"Replace"
                                  alternateButton:"Cancel"
                                      otherButton:nil
-                       informativeTextWithFormat:"Enter the URL where your styles live."];
+                       informativeTextWithFormat:"Enter the URL where your styles and/or colors live. Any existing document styles or global colors will be replaced."];
 
     var input = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 300, 54)];
     input.setStringValue(dict['syncSource'] || "https://docs.google.com/spreadsheets/d/17q6GOMM1X6kkvgeL3LeGkRr4C2vOhpM_JiQUWxbBtew/pubhtml");
     alert.setAccessoryView(input);
-    var button = alert.runModal();
     input.validateEditing();
     dict['syncSource'] = input.stringValue();
+    return alert.runModal();
   }
 
   function capitalize(string) {

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Stan
+Copyright (c) 2016 Stan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-