Skip to content

Commit 04b6cf3

Browse files
author
Matt Karl
committed
Removed Progress Tracker Client. Updated SpringRoll Container
1 parent 092dc47 commit 04b6cf3

File tree

9 files changed

+72
-203
lines changed

9 files changed

+72
-203
lines changed

‎bower.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"wavesurfer.js": "*",
1212
"underscore": "~1.7.0",
1313
"node-webkit-app": "*",
14-
"pbskids-pt-client": "SpringRoll/ProgressTrackerClient",
1514
"sortable": "farhadi/html5sortable",
1615
"default": "https://github.com/SpringRoll/SpringRollTemplate.git",
1716
"sunlight": "https://github.com/CloudKidStudio/sunlight.git#master"

‎deploy/assets/templates/default/gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
components/
1+
/components/
22
node_modules/
33
*.map
4-
.DS_Store
4+
.DS_Store
5+
*.sublime-*
6+
RECOVER_*
7+
npm-debug.log

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

Lines changed: 52 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name" : "Default",
33
"id" : "io.springroll.default",
4-
"version" : "1.4.3",
4+
"version" : "1.5.0",
55
"github": "SpringRoll/SpringRollTemplate",
66
"rename" : {
77
"gitignore" : ".gitignore",
@@ -23,7 +23,7 @@
2323
"components/springroll/dist/core.css"
2424
],
2525
"bower": {
26-
"springroll": "*"
26+
"springroll": "~0.4"
2727
},
2828
"libraries": "components/preloadjs/lib/preloadjs.min.js",
2929
"librariesDebug": "components/preloadjs/lib/preloadjs.combined.js",
@@ -52,22 +52,19 @@
5252
"librariesDebug": "components/bellhop/dist/bellhop.js",
5353
"default": true
5454
},
55+
{
56+
"id": "animation",
57+
"name": "Animation",
58+
"description": "Use of the Animator to playback various animation formats",
59+
"main": "components/springroll/dist/modules/animation.min.js",
60+
"mainDebug": "components/springroll/dist/modules/animation.js"
61+
},
5562
{
5663
"id": "states",
5764
"name": "States",
5865
"description": "Add states to Application and a transition",
5966
"main": "components/springroll/dist/modules/states.min.js",
60-
"mainDebug": "components/springroll/dist/modules/states.js",
61-
"depends": [
62-
["pixi-animation", "easeljs-animation"]
63-
]
64-
},
65-
{
66-
"id": "tasks",
67-
"name": "Tasks",
68-
"description": "Manager for asynchronous tasks, like loading multiple assets",
69-
"main": "components/springroll/dist/modules/tasks.min.js",
70-
"mainDebug": "components/springroll/dist/modules/tasks.js"
67+
"mainDebug": "components/springroll/dist/modules/states.js"
7168
},
7269
{
7370
"id": "sound",
@@ -120,34 +117,6 @@
120117
"main": "components/springroll/dist/modules/languages.min.js",
121118
"mainDebug": "components/springroll/dist/modules/languages.js"
122119
},
123-
{
124-
"id": "learning",
125-
"name": "Learning",
126-
"description": "Integration for sending events with the Learning dispatcher",
127-
"main": "components/springroll/dist/modules/learning.min.js",
128-
"mainDebug": [
129-
"components/springroll/dist/modules/learning.js",
130-
"components/springroll/dist/modules/learning.css"
131-
],
132-
"bower": {
133-
"jquery": "*"
134-
},
135-
"librariesDebug": [
136-
"components/jquery/dist/jquery.js"
137-
]
138-
},
139-
{
140-
"id": "learning-media",
141-
"name": "Learning Media",
142-
"description": "Convenience functions for playing and dispatching events for feedback, movie playback, voice over.",
143-
"main": "components/springroll/dist/modules/learning-media.min.js",
144-
"mainDebug": "components/springroll/dist/modules/learning-media.js",
145-
"depends": [
146-
"captions",
147-
"sound",
148-
["pixi-animation", "easeljs-animation"]
149-
]
150-
},
151120
{
152121
"id": "hints",
153122
"name": "Hints",
@@ -156,7 +125,7 @@
156125
"mainDebug": "components/springroll/dist/modules/hints.js",
157126
"depends": [
158127
"sound",
159-
["pixi-animation", "easeljs-animation"]
128+
"animation"
160129
]
161130
},
162131
{
@@ -206,7 +175,10 @@
206175
"components/tweenjs/lib/tweenjs.combined.js",
207176
"components/easeljs/lib/movieclip.combined.js"
208177
],
209-
"depends": ["easeljs-display"]
178+
"depends": [
179+
"animation",
180+
"easeljs-display"
181+
]
210182
},
211183
{
212184
"id": "easeljs-ui",
@@ -215,29 +187,9 @@
215187
"main": "components/springroll/dist/modules/easeljs-ui.min.js",
216188
"mainDebug": "components/springroll/dist/modules/easeljs-ui.js",
217189
"depends": [
218-
"easeljs-display",
219-
"easeljs-utils"
220-
]
221-
},
222-
{
223-
"id": "easeljs-learning",
224-
"name": "EaselJS Learning",
225-
"description": "EaselJS-specific convenience utilities for event tracking",
226-
"main": "components/springroll/dist/modules/easeljs-learning.min.js",
227-
"mainDebug": "components/springroll/dist/modules/easeljs-learning.js",
228-
"depends": [
229-
"easeljs-display",
230-
"learning"
190+
"easeljs-display"
231191
]
232192
},
233-
{
234-
"id": "easeljs-utils",
235-
"name": "EaselJS Utilities",
236-
"description": "Contains bitmap utilities for managing, loading and formatting bitmaps",
237-
"main": "components/springroll/dist/modules/easeljs-utils.min.js",
238-
"mainDebug": "components/springroll/dist/modules/easeljs-utils.js",
239-
"depends": ["easeljs-display"]
240-
},
241193
{
242194
"id": "easeljs-cutscene",
243195
"name": "EaselJS Cutscene",
@@ -246,11 +198,20 @@
246198
"mainDebug": "components/springroll/dist/modules/easeljs-cutscene.js",
247199
"depends": [
248200
"easeljs-display",
249-
"easeljs-animation",
250-
"easeljs-utils",
251-
"tasks"
201+
"animation",
202+
"easeljs-animation"
252203
]
253204
},
205+
{
206+
"id": "easeljs-cursor",
207+
"name": "EaselJS Cursor",
208+
"description": "Add a custom cursor to the Application",
209+
"main": "components/springroll-cursor/dist/modules/easeljs-cursor.min.js",
210+
"mainDebug": "components/springroll-cursor/dist/modules/easeljs-cursor.js",
211+
"bower": {
212+
"springroll-cursor": "*"
213+
}
214+
},
254215
{
255216
"id": "pixi-display",
256217
"name": "Pixi.js Display",
@@ -260,8 +221,8 @@
260221
"bower": {
261222
"pixi.js":"https://github.com/SpringRoll/pixi.js.git"
262223
},
263-
"libraries": "components/pixi.js/bin/pixi.js",
264-
"librariesDebug": "components/pixi.js/bin/pixi.dev.js",
224+
"libraries": "components/pixi.js/bin/pixi.min.js",
225+
"librariesDebug": "components/pixi.js/bin/pixi.js",
265226
"display": "springroll.pixi.PixiDisplay"
266227
},
267228
{
@@ -270,7 +231,21 @@
270231
"description": "Manage animation playback with sprites or Spine animations",
271232
"main": "components/springroll/dist/modules/pixi-animation.min.js",
272233
"mainDebug": "components/springroll/dist/modules/pixi-animation.js",
273-
"depends": ["pixi-display"]
234+
"depends": [
235+
"animation",
236+
"pixi-display"
237+
]
238+
},
239+
{
240+
"id": "pixi-spine",
241+
"name": "Pixi.js Spine",
242+
"description": "Manage spine playback and loading",
243+
"main": "components/springroll/dist/modules/pixi-spine.min.js",
244+
"mainDebug": "components/springroll/dist/modules/pixi-spine.js",
245+
"depends": [
246+
"animation",
247+
"pixi-display"
248+
]
274249
},
275250
{
276251
"id": "pixi-ui",
@@ -289,23 +264,14 @@
289264
"display": "springroll.native.NativeDisplay"
290265
},
291266
{
292-
"id": "container",
293-
"name": "Container",
294-
"description": "The container for interacting with SpringRoll projects that are iframed",
295-
"main": "components/springroll/dist/modules/container.min.js",
296-
"mainDebug": "components/springroll/dist/modules/container.js",
267+
"id": "keyboard",
268+
"name": "Keyboard",
269+
"description": "A keyboard input handling plugin",
270+
"main": "components/springroll-keyboard/dist/keyboard.min.js",
271+
"mainDebug": "components/springroll-keyboard/dist/keyboard.js",
297272
"bower": {
298-
"bellhop": "*",
299-
"jquery": "*"
300-
},
301-
"libraries":[
302-
"components/bellhop/dist/bellhop.min.js",
303-
"components/jquery/dist/jquery.min.js"
304-
],
305-
"librariesDebug": [
306-
"components/bellhop/dist/bellhop.js",
307-
"components/jquery/dist/jquery.js"
308-
]
273+
"springroll-keyboard": "*"
274+
}
309275
}
310276
]
311277
}

‎project.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"components/sortable/jquery.sortable.js",
2020
"components/bootstrap/dist/js/bootstrap.min.js",
2121
"components/bellhop/dist/bellhop.min.js",
22-
"components/pbskids-pt-client/dist/progress-tracker-client.min.js",
2322
"components/springroll/dist/modules/container.min.js",
2423
"components/bootstrap/less/bootstrap.less",
2524
"components/bootstrap-confirmation2/bootstrap-confirmation.js",
@@ -38,7 +37,6 @@
3837
"components/sortable/jquery.sortable.js",
3938
"components/bootstrap/dist/js/bootstrap.js",
4039
"components/bellhop/dist/bellhop.js",
41-
"components/pbskids-pt-client/dist/progress-tracker-client.js",
4240
"components/springroll/dist/modules/container.js",
4341
"components/bootstrap/less/bootstrap.less",
4442
"components/bootstrap-confirmation2/bootstrap-confirmation.min.js",

‎src/jade/preview-client.jade‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,24 +127,7 @@ html
127127
option(value='tahoma') Tahoma
128128
option(value='times') Times New Roman
129129
option(value='trebuchet') Trebuchet MS
130-
option(value='verdana') Verdana
131-
button#settingsButton.btn.btn-primary.main.disabled(data-toggle-div='#settings', data-placement='bottom', data-toggle='tooltip', title='Logging Service')
132-
span.icon.icon-gear
133-
form#settings.drop-down.form.form-horizontal
134-
.form-group.form-title
135-
button#cancelSettings.close(data-toggle-div='#settings')
136-
| ×
137-
| Logging Service
138-
.form-group
139-
label.col-xs-4.control-label Host or IP
140-
.col-xs-8: input.pause-on-focus.form-control#remoteHost(type='text', name='remoteHost')
141-
.form-group
142-
label.col-xs-4.control-label Channel Name
143-
.col-xs-8: input.pause-on-focus.form-control#remoteChannel(type='text', name='remoteChannel')
144-
.form-group.text-center
145-
.col-xs-8.col-xs-offset-4
146-
button#remoteConnect.btn.btn-primary.btn-block.disabled(data-toggle-div='#settings')
147-
| Connect
130+
option(value='verdana') Verdana
148131
button#pauseButton.btn.btn-primary.main.unpaused.disabled(data-placement='bottom', data-toggle='tooltip', title='Play/Pause')
149132
span.icon.icon-pause.on
150133
span.icon.icon-play.off

‎src/js/preview/Preview.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@
6767
{
6868
// Set the project title and
6969
this.container.appTitle.text(this.server.title);
70-
this.container.remoteChannel.val(this.server.title);
71-
this.container.connectLoggingService();
7270
}
73-
this.container.open(this.location);
71+
this.container.openPath(this.location);
7472
this.container.once('closed', this.open.bind(this));
7573
};
7674

‎src/js/preview/PreviewClient.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ $(function()
55
{
66
var container = new springroll.PreviewContainer();
77
container.appTitle.text(title);
8-
container.remoteChannel.val(title);
9-
container.connectLoggingService();
10-
container.open('/game');
8+
container.openPath('/game');
119
});
1210

1311
});

0 commit comments

Comments
 (0)