Merge pull request #994 from NativeScript/fatme/sync-files-from-app_r…

…esources Sync files that are in App_Resources
NativeScript · Oct 2, 2015 · fb1257c · fb1257c
2 parents ad7bfe0 + 2f430e8
commit fb1257c
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/services/usb-livesync-service.ts b/lib/services/usb-livesync-service.ts
@@ -79,7 +79,15 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
 			let beforeBatchLiveSyncAction = (filePath: string): IFuture<string> => {
 				return (() => {
 					let projectFileInfo = this.getProjectFileInfo(filePath);
-					return path.join(projectFilesPath, path.relative(path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME), projectFileInfo.onDeviceName));
+					let result = path.join(projectFilesPath, path.relative(path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME), projectFileInfo.onDeviceName));
+
+					// Handle files that are in App_Resources
+					if(filePath.indexOf(path.join(constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME)) > -1) {
+						let appResourcesRelativePath = path.relative(path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, platformData.normalizedPlatformName), filePath);
+						result = path.join(platformData.platformProjectService.getAppResourcesDestinationDirectoryPath().wait(), appResourcesRelativePath);
+					}
+
+					return result;
 				}).future<string>()();
 			};