Removed Progress Tracker Client. Updated SpringRoll Container

Author: Matt Karl

bower.json

@@ -11,7 +11,6 @@
 		"wavesurfer.js": "*",
 		"underscore": "~1.7.0",
 		"node-webkit-app": "*",
-		"pbskids-pt-client": "SpringRoll/ProgressTrackerClient",
 		"sortable": "farhadi/html5sortable",
 		"default": "https://github.com/SpringRoll/SpringRollTemplate.git",
 		"sunlight": "https://github.com/CloudKidStudio/sunlight.git#master"

deploy/assets/templates/default/gitignore

@@ -1,4 +1,7 @@
-components/
+/components/
 node_modules/
 *.map
-.DS_Store
+.DS_Store
+*.sublime-*
+RECOVER_*
+npm-debug.log

deploy/assets/templates/default/springroll-template.json

@@ -1,7 +1,7 @@
 {
 	"name" : "Default",
 	"id" : "io.springroll.default",
-	"version" : "1.4.3",
+	"version" : "1.5.0",
 	"github": "SpringRoll/SpringRollTemplate",
 	"rename" : {
 		"gitignore" : ".gitignore",
@@ -23,7 +23,7 @@
 				"components/springroll/dist/core.css"
 			],
 			"bower": {
-				"springroll": "*"
+				"springroll": "~0.4"
 			},
 			"libraries": "components/preloadjs/lib/preloadjs.min.js",
 			"librariesDebug": "components/preloadjs/lib/preloadjs.combined.js",
@@ -52,22 +52,19 @@
 			"librariesDebug": "components/bellhop/dist/bellhop.js",
 			"default": true
 		},
+		{
+			"id": "animation",
+			"name": "Animation",
+			"description": "Use of the Animator to playback various animation formats",
+			"main": "components/springroll/dist/modules/animation.min.js",
+			"mainDebug": "components/springroll/dist/modules/animation.js"
+		},
 		{
 			"id": "states",
 			"name": "States",
 			"description": "Add states to Application and a transition",
 			"main": "components/springroll/dist/modules/states.min.js",
-			"mainDebug": "components/springroll/dist/modules/states.js",
-			"depends": [
-				["pixi-animation", "easeljs-animation"]
-			]
-		},
-		{
-			"id": "tasks",
-			"name": "Tasks",
-			"description": "Manager for asynchronous tasks, like loading multiple assets",
-			"main": "components/springroll/dist/modules/tasks.min.js",
-			"mainDebug": "components/springroll/dist/modules/tasks.js"
+			"mainDebug": "components/springroll/dist/modules/states.js"
 		},
 		{
 			"id": "sound",
@@ -120,34 +117,6 @@
 			"main": "components/springroll/dist/modules/languages.min.js",
 			"mainDebug": "components/springroll/dist/modules/languages.js"
 		},
-		{
-			"id": "learning",
-			"name": "Learning",
-			"description": "Integration for sending events with the Learning dispatcher",
-			"main": "components/springroll/dist/modules/learning.min.js",
-			"mainDebug": [
-				"components/springroll/dist/modules/learning.js",
-				"components/springroll/dist/modules/learning.css"
-			],
-			"bower": {
-				"jquery": "*"
-			},
-			"librariesDebug": [
-				"components/jquery/dist/jquery.js"
-			]
-		},
-		{
-			"id": "learning-media",
-			"name": "Learning Media",
-			"description": "Convenience functions for playing and dispatching events for feedback, movie playback, voice over.",
-			"main": "components/springroll/dist/modules/learning-media.min.js",
-			"mainDebug": "components/springroll/dist/modules/learning-media.js",
-			"depends": [
-				"captions",
-				"sound",
-				["pixi-animation", "easeljs-animation"]
-			]
-		},
 		{
 			"id": "hints",
 			"name": "Hints",
@@ -156,7 +125,7 @@
 			"mainDebug": "components/springroll/dist/modules/hints.js",
 			"depends": [
 				"sound",
-				["pixi-animation", "easeljs-animation"]
+				"animation"
 			]
 		},
 		{
@@ -206,7 +175,10 @@
 				"components/tweenjs/lib/tweenjs.combined.js",
 				"components/easeljs/lib/movieclip.combined.js"
 			],
-			"depends": ["easeljs-display"]
+			"depends": [
+				"animation",
+				"easeljs-display"
+			]
 		},
 		{
 			"id": "easeljs-ui",
@@ -215,29 +187,9 @@
 			"main": "components/springroll/dist/modules/easeljs-ui.min.js",
 			"mainDebug": "components/springroll/dist/modules/easeljs-ui.js",
 			"depends": [
-				"easeljs-display",
-				"easeljs-utils"
-			]
-		},
-		{
-			"id": "easeljs-learning",
-			"name": "EaselJS Learning",
-			"description": "EaselJS-specific convenience utilities for event tracking",
-			"main": "components/springroll/dist/modules/easeljs-learning.min.js",
-			"mainDebug": "components/springroll/dist/modules/easeljs-learning.js",
-			"depends": [
-				"easeljs-display",
-				"learning"
+				"easeljs-display"
 			]
 		},
-		{
-			"id": "easeljs-utils",
-			"name": "EaselJS Utilities",
-			"description": "Contains bitmap utilities for managing, loading and formatting bitmaps",
-			"main": "components/springroll/dist/modules/easeljs-utils.min.js",
-			"mainDebug": "components/springroll/dist/modules/easeljs-utils.js",
-			"depends": ["easeljs-display"]
-		},
 		{
 			"id": "easeljs-cutscene",
 			"name": "EaselJS Cutscene",
@@ -246,11 +198,20 @@
 			"mainDebug": "components/springroll/dist/modules/easeljs-cutscene.js",
 			"depends": [
 				"easeljs-display",
-				"easeljs-animation",
-				"easeljs-utils",
-				"tasks"
+				"animation",
+				"easeljs-animation"
 			]
 		},
+		{
+			"id": "easeljs-cursor",
+			"name": "EaselJS Cursor",
+			"description": "Add a custom cursor to the Application",
+			"main": "components/springroll-cursor/dist/modules/easeljs-cursor.min.js",
+			"mainDebug": "components/springroll-cursor/dist/modules/easeljs-cursor.js",
+			"bower": {
+				"springroll-cursor": "*"
+			}
+		},
 		{
 			"id": "pixi-display",
 			"name": "Pixi.js Display",
@@ -260,8 +221,8 @@
 			"bower": {
 				"pixi.js":"https://github.com/SpringRoll/pixi.js.git"
 			},
-			"libraries": "components/pixi.js/bin/pixi.js",
-			"librariesDebug": "components/pixi.js/bin/pixi.dev.js",
+			"libraries": "components/pixi.js/bin/pixi.min.js",
+			"librariesDebug": "components/pixi.js/bin/pixi.js",
 			"display": "springroll.pixi.PixiDisplay"
 		},
 		{
@@ -270,7 +231,21 @@
 			"description": "Manage animation playback with sprites or Spine animations",
 			"main": "components/springroll/dist/modules/pixi-animation.min.js",
 			"mainDebug": "components/springroll/dist/modules/pixi-animation.js",
-			"depends": ["pixi-display"]
+			"depends": [
+				"animation", 
+				"pixi-display"
+			]
+		},
+		{
+			"id": "pixi-spine",
+			"name": "Pixi.js Spine",
+			"description": "Manage spine playback and loading",
+			"main": "components/springroll/dist/modules/pixi-spine.min.js",
+			"mainDebug": "components/springroll/dist/modules/pixi-spine.js",
+			"depends": [
+				"animation", 
+				"pixi-display"
+			]
 		},
 		{
 			"id": "pixi-ui",
@@ -289,23 +264,14 @@
 			"display": "springroll.native.NativeDisplay"
 		},
 		{
-			"id": "container",
-			"name": "Container",
-			"description": "The container for interacting with SpringRoll projects that are iframed",
-			"main": "components/springroll/dist/modules/container.min.js",
-			"mainDebug": "components/springroll/dist/modules/container.js",
+			"id": "keyboard",
+			"name": "Keyboard",
+			"description": "A keyboard input handling plugin",
+			"main": "components/springroll-keyboard/dist/keyboard.min.js",
+			"mainDebug": "components/springroll-keyboard/dist/keyboard.js",
 			"bower": {
-				"bellhop": "*",
-				"jquery": "*"
-			},
-			"libraries":[
-				"components/bellhop/dist/bellhop.min.js",
-				"components/jquery/dist/jquery.min.js"
-			],
-			"librariesDebug": [
-				"components/bellhop/dist/bellhop.js",
-				"components/jquery/dist/jquery.js"
-			]
+				"springroll-keyboard": "*"
+			}
 		}
 	]
 }

project.json

@@ -19,7 +19,6 @@
 		"components/sortable/jquery.sortable.js",
 		"components/bootstrap/dist/js/bootstrap.min.js",
 		"components/bellhop/dist/bellhop.min.js",
-		"components/pbskids-pt-client/dist/progress-tracker-client.min.js",
 		"components/springroll/dist/modules/container.min.js",
 		"components/bootstrap/less/bootstrap.less",
 		"components/bootstrap-confirmation2/bootstrap-confirmation.js",
@@ -38,7 +37,6 @@
 		"components/sortable/jquery.sortable.js",
 		"components/bootstrap/dist/js/bootstrap.js",
 		"components/bellhop/dist/bellhop.js",
-		"components/pbskids-pt-client/dist/progress-tracker-client.js",
 		"components/springroll/dist/modules/container.js",
 		"components/bootstrap/less/bootstrap.less",
 		"components/bootstrap-confirmation2/bootstrap-confirmation.min.js",

src/jade/preview-client.jade

@@ -127,24 +127,7 @@ html
 							option(value='tahoma') Tahoma
 							option(value='times') Times New Roman
 							option(value='trebuchet') Trebuchet MS
-							option(value='verdana') Verdana						
-				button#settingsButton.btn.btn-primary.main.disabled(data-toggle-div='#settings', data-placement='bottom', data-toggle='tooltip', title='Logging Service')
-					span.icon.icon-gear
-				form#settings.drop-down.form.form-horizontal
-					.form-group.form-title
-						button#cancelSettings.close(data-toggle-div='#settings')
-							| ×
-						| Logging Service
-					.form-group
-						label.col-xs-4.control-label Host or IP
-						.col-xs-8: input.pause-on-focus.form-control#remoteHost(type='text', name='remoteHost')
-					.form-group
-						label.col-xs-4.control-label Channel Name
-						.col-xs-8: input.pause-on-focus.form-control#remoteChannel(type='text', name='remoteChannel')
-					.form-group.text-center
-						.col-xs-8.col-xs-offset-4
-							button#remoteConnect.btn.btn-primary.btn-block.disabled(data-toggle-div='#settings')
-								| Connect
+							option(value='verdana') Verdana
 				button#pauseButton.btn.btn-primary.main.unpaused.disabled(data-placement='bottom', data-toggle='tooltip', title='Play/Pause')
 					span.icon.icon-pause.on
 					span.icon.icon-play.off

src/js/preview/Preview.js

@@ -67,10 +67,8 @@
 		{
 			// Set the project title and 
 			this.container.appTitle.text(this.server.title);
-			this.container.remoteChannel.val(this.server.title);
-			this.container.connectLoggingService();
 		}
-		this.container.open(this.location);
+		this.container.openPath(this.location);
 		this.container.once('closed', this.open.bind(this));
 	};
 

src/js/preview/PreviewClient.js

@@ -5,9 +5,7 @@ $(function()
 	{
 		var container = new springroll.PreviewContainer();
 		container.appTitle.text(title);
-		container.remoteChannel.val(title);
-		container.connectLoggingService();
-		container.open('/game');
+		container.openPath('/game');
 	});
 
 });