hotfix for module loading

eclifford · Aug 1, 2014 · ae0c7b2 · ae0c7b2
1 parent c10a91e
commit ae0c7b2
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 510 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bronsonjs",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "AMD module framework for building large scale javascript applications",
   "homepage": "https://github.com/eclifford/bronson",
   "authors": [

diff --git a/bronson.js b/bronson.js
@@ -20,7 +20,7 @@
   'use strict';
 
   var Bronson =  {
-    version: '2.0.14',
+    version: '2.0.15',
 
     settings: {
       options: {

diff --git a/bronson.min.js b/bronson.min.js
diff --git a/demo/app/common.coffee b/demo/app/common.coffee
@@ -17,12 +17,10 @@ require.config
     'backbone.wreqr': 'vendor/bower_components/backbone.wreqr/lib/amd/backbone.wreqr'
     'backbone.babysitter': 'vendor/bower_components/backbone.babysitter/lib/amd/backbone.babysitter'
     'marionette': 'vendor/bower_components/marionette/lib/core/amd/backbone.marionette'
-    'bronson': 'vendor/bronson'
+    'bronson': 'vendor/bower_components/bronson/bronson'
     'text': 'vendor/bower_components/requirejs-text/text'
     'tpl': 'vendor/bower_components/requirejs-tpl/tpl'
 
   shim:
     'bootstrap':
       deps: ["jquery"]
-
-