restructuring, clean up browserify integration

dweis · Mar 8, 2013 · 8326a23 · 8326a23
1 parent 46192da
commit 8326a23
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 42 deletions.
diff --git a/client/air_hockey.js b/client/air_hockey.js
@@ -1,10 +1,10 @@
 var _ = require('underscore')
   , GoalView = require('./ui/views/goal')
-  , PlayerModel = require('./ui/models/player')
+  , PlayerModel = require('../common/models/player')
   , PlayerView = require('./ui/views/player')
   , PlayerSetupView = require('./ui/views/player_setup')
   , MenuView = require('./ui/views/menu')
-  , SpectatorsCollection = require('./ui/collections/spectators')
+  , SpectatorsCollection = require('../common/collections/spectators')
   , SpectatorsView = require('./ui/views/spectators')
   , Physics = require('../common/physics');
 

diff --git a/client/ui/templates/goal.hbs b/client/ui/templates/goal.hbs
@@ -0,0 +1,2 @@
+GOAL!
+<p>{{name}} scored!</p>
diff --git a/client/ui/templates/goal.js b/client/ui/templates/goal.js
diff --git a/client/ui/templates/player.hbs b/client/ui/templates/player.hbs
@@ -0,0 +1,7 @@
+<span style="float: left;">
+<img src="{{gravatarUrl}}" align="left"/>
+</span>
+<span>
+<h1>{{name}}</h1>
+<div class="score">{{score}}</div>
+</span>
diff --git a/client/ui/templates/player.js b/client/ui/templates/player.js
diff --git a/client/ui/templates/spectator.hbs b/client/ui/templates/spectator.hbs
@@ -0,0 +1,4 @@
+<div class="spectator">
+<img src="{{gravatarUrl}}"/>
+<h1>{{name}}</h1>
+</div>
diff --git a/client/ui/templates/spectator.js b/client/ui/templates/spectator.js
diff --git a/client/ui/views/goal.js b/client/ui/views/goal.js
@@ -1,6 +1,6 @@
 var Backbone = require('backbone')
   , _ = require('underscore')
-  , goalTemplate = require('../templates/goal');
+  , goalTemplate = require('../templates/goal.hbs');
 
 var GoalView = Backbone.View.extend({
   template: goalTemplate,

diff --git a/client/ui/views/player.js b/client/ui/views/player.js
@@ -1,7 +1,7 @@
 var Backbone = require('backbone')
   , _ = require('underscore')
-  , PlayerModel = require('../models/player')
-  , playerTemplate = require('../templates/player');
+  , PlayerModel = require('../../../common/models/player')
+  , playerTemplate = require('../templates/player.hbs');
 
 var PlayerView = Backbone.View.extend({
   template: playerTemplate,

diff --git a/client/ui/views/spectator.js b/client/ui/views/spectator.js
@@ -1,6 +1,6 @@
 var Backbone = require('backbone')
   , _ = require('underscore')
-  , spectatorTemplate = require('../templates/spectator');
+  , spectatorTemplate = require('../templates/spectator.hbs');
 
 var SpectatorView = Backbone.View.extend({
   template: spectatorTemplate,

diff --git a/client/ui/collections/spectators.js → common/collections/spectators.js b/client/ui/collections/spectators.js → common/collections/spectators.js
diff --git a/client/ui/models/player.js → common/models/player.js b/client/ui/models/player.js → common/models/player.js
diff --git a/public/stylesheets/gameui.css b/public/stylesheets/gameui.css
@@ -95,7 +95,7 @@ body {
   border: 3px solid rgba(128, 128, 128, 0.8);
   border-radius: 10px;
   font-size: 10px;
-  width: 300px;
+  width: 200px;
   margin-right: 5px;
   margin-bottom: 5px;
   padding: 7px;

diff --git a/server/middleware/browserify.js b/server/middleware/browserify.js
@@ -1,4 +1,5 @@
-var browserify = require('browserify');
+var browserify = require('browserify')
+  , handleify = require('handleify');
 
 function browserify_middleware(opts, bundleCallback) {
 	var bundle, cache_time;
@@ -10,6 +11,8 @@ function browserify_middleware(opts, bundleCallback) {
 
 	bundle = browserify(opts.entry);
 
+  bundle.transform(handleify);
+
   if (typeof bundleCallback == 'function') bundleCallback(bundle);
 
 	opts.bundle_opts = opts.bundle_opts || {};