Merge pull request #7 from marvelapp/development

Merge dev into master
marvelapp · Aug 19, 2015 · 7e1f158 · 7e1f158
2 parents 7aa0e7b + d2ae87a
commit 7e1f158
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/Marvel.sketchplugin/Contents/Sketch/api.js b/Marvel.sketchplugin/Contents/Sketch/api.js
@@ -250,24 +250,37 @@ function fireSendArtboards(projectsArray, all, context){
 	var projectPopup = [[NSComboBox alloc] initWithFrame:NSMakeRect(74, yDropdowns, 266, 26)]
 	[projectPopup removeAllItems]
 	[projectPopup setFocusRingType:NSFocusRingTypeNone]
-	var lastUsedProjectId = settings.getLastUsedProject(context);
-	var lastUsedProjectIdIndex;
-	var projectNames = [];
+	var lastUsedProjectId = settings.getLastUsedProject(context)
+	var lastUsedProjectIdIndex
+	var projectNames = []
+
+	var noProjects = false
+	if(projectsArray.length == 0){
+		noProjects = true
+	}
+
+	sketchLog(context, "Find pre used projects");
 	for (i = 0; i < projectsArray.length; ++i) {
 			projectNames.push(projectsArray[i].name);
 
 			if(lastUsedProjectId == projectsArray[i].id){
 				lastUsedProjectIdIndex = i;
+				sketchLog(context, "Last used project index " + lastUsedProjectIdIndex + "and ID is " + projectsArray[i].id)
 			}
 	}
 	[projectPopup addItemsWithObjectValues:projectNames]
+
+	sketchLog(context, "Set last used project")
+
 	if(lastUsedProjectIdIndex){
 		[projectPopup selectItemAtIndex:lastUsedProjectIdIndex]
 	} else {
-		[projectPopup selectItemAtIndex:0]
+		if (noProjects == false){
+			sketchLog(context, "There are projects")
+			[projectPopup selectItemAtIndex:0]
+		}
 	}
 	[[windowSendArtboards contentView] addSubview:projectPopup]
-
 	var subtitleField = [[NSTextField alloc] initWithFrame:NSMakeRect(74, yDropdowns - 28, 266, 26)]
 	[subtitleField setEditable:false]
 	[subtitleField setBordered:false]
@@ -373,6 +386,7 @@ function fireSendArtboards(projectsArray, all, context){
 					}
 					settings.saveScaleSetting(scaleString,context)
 					settings.saveLastUsedProject(projectId,context)
+
 					[windowSendArtboards orderOut:nil]
 					[app stopModal]
 
@@ -696,7 +710,8 @@ function getProjectNamesArray(context) {
 
 			   } else {
 
-			   	return false
+			   	var projects = [];
+			   	return projects;
 
 			  }
 

diff --git a/Marvel.sketchplugin/Contents/Sketch/updates.js b/Marvel.sketchplugin/Contents/Sketch/updates.js
@@ -41,13 +41,14 @@ var updatesChecker = {
 
        	if (error == nil && data != nil)
        	{	    
-       	    var errorJson;
+       	  var errorJson;
 
        		var res = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:errorJson]
 
        		if(errorJson == nil){
-       			return res.version
-
+            if(res.version){
+       			  return res.version
+            }
        		} else {
        			sketchLog(context,"NSURLConnection updatesChecker.getNewestVersionNumber() Convert to JSON failed")
        			return false
@@ -56,6 +57,7 @@ var updatesChecker = {
        	} 
 
        	sketchLog(context,"updatesChecker.getNewestVersionNumber() failed")
+        [app displayDialog:"Try again later..." withTitle:"Could not contact GitHub properly."]
        	return false
 
     }