V2.6.1

Esri · Dec 17, 2016 · 6b5604f · 6b5604f
1 parent c272100
commit 6b5604f
Show file tree

Hide file tree

Showing 41 changed files with 407 additions and 422 deletions.
diff --git a/MapTour/.jshintrc b/MapTour/.jshintrc
@@ -2,7 +2,7 @@
 	"browser": true,
 	"dojo": true,
 	"jquery": true,
-	
+
 	"globals": {
 		"console": false,
 		"alert": false,
@@ -18,9 +18,9 @@
 		"configOptions": true,
 		"commonConfig": true,
 		"version": false,
-		"i18n": false,
+		"i18n": true,
 		"app": true,
-		"loadingIndicator": false,
+		"loadingIndicator": true,
 		"mediaNotFoundHandler": false,
 
 		"FB": false,
@@ -32,7 +32,7 @@
 		"iScroll": false,
 		"History": false
 	},
-	
+
 	"expr": true,
 	"laxbreak": true,
 	"eqnull": true,
@@ -42,4 +42,4 @@
 	"noarg": true,
 	"undef": true,
 	"unused": true
-}
+}
diff --git a/MapTour/Gruntfile.js b/MapTour/Gruntfile.js
@@ -1,26 +1,26 @@
 (function() {
 	module.exports = function(grunt) {
 		var APP_NAME = 'maptour';
-		
+
 		grunt.initConfig({
 			pkg: grunt.file.readJSON('package.json'),
-			
+
 			clean: {
 				deploy: ['deploy/*'],
 				css: [
-					'deploy/app/Responsive.css', 
-					'deploy/app/css/', 
-					'deploy/app/' + APP_NAME + '-css-app-min.css', 
+					'deploy/app/Responsive.css',
+					'deploy/app/css/',
+					'deploy/app/' + APP_NAME + '-css-app-min.css',
 					'deploy/app/' + APP_NAME + '-css-lib-min.css'
 				],
 				jsLib: ['deploy/app/lib/'],
 				jsTmp: [
-					'deploy/app/' + APP_NAME + '-app-viewer-min.js', 
-					'deploy/app/' + APP_NAME + '-app-builder-min.js', 
+					'deploy/app/' + APP_NAME + '-app-viewer-min.js',
+					'deploy/app/' + APP_NAME + '-app-builder-min.js',
 					'deploy/app/' + APP_NAME + '-lib-min.js'
 				]
 			},
-			
+
 			concat: {
 				options: {separator: ';'},
 				jsLib: {
@@ -40,7 +40,7 @@
 					dest: 'deploy/app/' + APP_NAME + '-min.css'
 				}
 			},
-			
+
 			uglify: {
 				jsLib: {
 					files: [{
@@ -51,7 +51,7 @@
 					}]
 				}
 			},
-			
+
 			requirejs: {
 			  viewer: {
 				options: {
@@ -80,7 +80,7 @@
 				}
 			  }
 			},
-			
+
 			cssmin: {
 					app: {
 						src: ['deploy/app/css/**/*.css', 'deploy/app/Responsive.css'],
@@ -90,9 +90,9 @@
 						src: ['src/lib/**/*.css'],
 						dest: 'deploy/app/' + APP_NAME + '-css-lib-min.css'
 					}
-				
+
 			},
-			
+
 			copy: {
 				css: {
 					files: [
@@ -128,6 +128,14 @@
 						dest: 'deploy/'
 					}]
 				},
+				mainApp: {
+					files: [{
+						expand: true,
+						cwd: 'src',
+						src:['app/main-app.js'],
+						dest: 'deploy/'
+					}]
+				},
 				bootstrapResources: {
 					files: [{
 						expand: true,
@@ -145,14 +153,14 @@
 					}]
 				}
 			},
-			
+
 			rename: {
 				moveResponsiveCss: {
 					src: 'deploy/app/css/storymaps/' + APP_NAME + '/ui/Responsive.css',
 					dest: 'deploy/app/Responsive.css'
 				}
 			},
-			
+
 			"regex-replace": {
 				css: {
 					src: ['deploy/app/' + APP_NAME + '-min.css'],
@@ -203,12 +211,12 @@
 					]
 				}
 			},
-			
+
 			jshint: {
 				files: ['src/app/**/*.js'],
 				options: {jshintrc: '.jshintrc'}
 			},
-			
+
 			connect: {
 				server: {
 					options: {
@@ -218,13 +226,13 @@
 					}
 				}
 			},
-			
+
 			watch: {
 				files: ['src/app/**/*.js'],
 				tasks: ['jshint']
 			}
 		});
-		
+
 		grunt.loadNpmTasks('grunt-contrib-clean');
 		grunt.loadNpmTasks('grunt-contrib-concat');
 		grunt.loadNpmTasks('grunt-contrib-uglify');
@@ -236,23 +244,23 @@
 		grunt.loadNpmTasks('grunt-contrib-jshint');
 		grunt.loadNpmTasks('grunt-contrib-connect');
 		grunt.loadNpmTasks('grunt-contrib-watch');
-		
+
 		grunt.registerTask('test', ['jshint']);
 		/* Run 'start grunt server' or 'grunt server &' to create a web server on port 8080 */
 		grunt.registerTask('server', ['connect']);
-		
+
 		grunt.registerTask('default', [
 			/* Comment out to disable code linting */
 			'jshint',
-			'clean:deploy', 
-			
-			/* 
+			'clean:deploy',
+
+			/*
 			 * Minify and concat external libraries JS using uglify
 			 */
-			'uglify:jsLib', 
+			'uglify:jsLib',
 			'concat:jsLib',
 			'clean:jsLib',
-			
+
 			/*
 			 * Minify project JS using require.js
 			 * - require.js output a .js for with only the viewer and a .js with viewer and builder
@@ -262,9 +270,9 @@
 			'requirejs',
 			'concat:viewerJS',
 			'concat:builderJS',
-			'clean:jsTmp', 
+			'clean:jsTmp',
 			'regex-replace:js',
-			
+
 			/*
 			 * Minify CSS
 			 * - start by copying all project's css in a tmp folder and exclude Responsive.css
@@ -278,13 +286,14 @@
 			'concat:css',
 			'regex-replace:css',
 			'clean:css',
-			
+
 			'copy:html',
 			'regex-replace:index',
 			'copy:config',
+			'copy:mainApp',
 			'copy:bootstrapResources',
 			'copy:colorboxResources',
 			'copy:resources'
 		]);
 	};
-})();
+})();
diff --git a/MapTour/package.json b/MapTour/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "StorytellingMapTour",
-	"version": "2.5.2",
+	"version": "2.6.1",
 	"devDependencies": {
 		"grunt": "~0.4.1",
 		"grunt-contrib-clean": "~0.4.0",