修复一个同步颜色的bug

weixin · Jun 25, 2017 · 51989c9 · 51989c9
1 parent a29e82c
commit 51989c9
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 39 deletions.
diff --git a/WeSketch.sketchplugin/Contents/Sketch/flag.js b/WeSketch.sketchplugin/Contents/Sketch/flag.js
@@ -279,7 +279,7 @@ function getFlag(context,refrush){
  if (context.selection.count()!=1) {
  flags = drawFunction(doc,null);
  if(!refrush){
- NSApp.displayDialog('画板已刷新，请只选择一个元素增删标志位');
+ NSApp.displayDialog('画板已刷新\n请选择一个元素增删标志位');
  }
  }else{
  flags = drawFunction(doc,context.selection[0]);

diff --git a/WeSketch.sketchplugin/Contents/Sketch/link.js b/WeSketch.sketchplugin/Contents/Sketch/link.js
@@ -905,7 +905,7 @@ function getLink(context,refursh){
  if (selection.count() != 1 && selection.count() != 2) {
  redrawConnections(context);
  if(!refursh){
- return NSApp.displayDialog('画板已刷新，请同时选中元素和 Artboard 添加连线，只选中元素可删除连线');
+ return NSApp.displayDialog('画板已刷新\n同时选中两个元素添加连线，只选中一个元素可删除连线');
  }
  }
 

diff --git a/WeSketch.sketchplugin/Contents/Sketch/syncColor.js b/WeSketch.sketchplugin/Contents/Sketch/syncColor.js
@@ -1,5 +1,42 @@
 @import "common.js"
 
+var SyncColor2 = function(context,UIKITURL) {
+ var app = NSApp.delegate();
+ var doc = context.document;
+ var theResponseData = request(UIKITURL);
+
+ var colorContents = "";
+
+ theText = [[NSString alloc] initWithData:theResponseData encoding:NSUTF8StringEncoding];
+
+ var dataPre = [theText substringToIndex:1];
+ if (dataPre == "<"){
+ NSApp.displayDialog("数据出错，请检查json文件");
+ return;
+ }else{
+ colorContents = theText 
+ }
+
+ var paletteContents = JSON.parse(colorContents.toString());
+ var palette = paletteContents.colors;
+
+ var colors = [];
+
+ for (var i = 0; i < palette.length; i++) {
+ colors.push(MSColor.colorWithRed_green_blue_alpha(
+ palette[i].red/255,
+ palette[i].green/255,
+ palette[i].blue/255,
+ palette[i].alpha
+ )); 
+ }
+
+ doc.documentData().assets().setColors(colors);
+
+ app.refreshCurrentDocument();
+
+}
+
 function syncColor(context){
  var colorUrlKey = "com.sketchplugins.wechat.colorurl";
  var scaleOptionsMatrix;
@@ -26,42 +63,7 @@ function syncColor(context){
  return settingsWindow.runModal();
  }
 
- var SyncColor = function(context,UIKITURL) {
- var app = NSApp.delegate();
- var doc = context.document;
- var theResponseData = request(UIKITURL);
-
- var colorContents = "";
-
- theText = [[NSString alloc] initWithData:theResponseData encoding:NSUTF8StringEncoding];
-
- var dataPre = [theText substringToIndex:1];
- if (dataPre == "<"){
- NSApp.displayDialog("数据出错，请检查json文件");
- return;
- }else{
- colorContents = theText 
- }
 
- var paletteContents = JSON.parse(colorContents.toString());
- var palette = paletteContents.colors;
-
- var colors = [];
-
- for (var i = 0; i < palette.length; i++) {
- colors.push(MSColor.colorWithRed_green_blue_alpha(
- palette[i].red/255,
- palette[i].green/255,
- palette[i].blue/255,
- palette[i].alpha
- )); 
- }
-
- doc.documentData().assets().setColors(colors);
-
- app.refreshCurrentDocument();
-
- }
 
  var app = NSApp.delegate();
  var doc = context.document;
@@ -75,7 +77,7 @@ function syncColor(context){
 
  var index = [uikit tag];
  var UIKITURL = List[index].url;
- SyncColor(context,UIKITURL);
+ SyncColor2(context,UIKITURL);
  context.document.showMessage("色板已同步到 Document Colors，请重新打开色板查看");
 }
 

diff --git a/WeSketch.sketchplugin/Contents/Sketch/syncUIkit.js b/WeSketch.sketchplugin/Contents/Sketch/syncUIkit.js
@@ -89,7 +89,7 @@ function syncUIkit(context){
  var tbColor = '';
  for(var co = 0;co<colorList.length;co ++){
  if(colorList[co].title == List[index].title){
- SyncColor(context,colorList[co].url);
+ SyncColor2(context,colorList[co].url);
  tbColor = '\r\n色板已同步到 Document Colors，请重新打开色板查看';
  break;
  }