Skip to content

Commit

Permalink
Update test projects to use '_name' instead of 'name_dev'. Updated np…
Browse files Browse the repository at this point in the history
…m versions from 'latest' to specific versions.
  • Loading branch information
Kevin Malakoff committed Jun 15, 2012
1 parent 5826da5 commit f7b688f
Show file tree
Hide file tree
Showing 17 changed files with 113 additions and 98 deletions.
2 changes: 1 addition & 1 deletion ex_backbone_articulation_js/test.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root = if typeof(window) == 'undefined' then global else window
root = @

$(document).ready( ->
module("Backbone.Articulation.js")
Expand Down
2 changes: 1 addition & 1 deletion ex_background_js/test.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root = if typeof(window) == 'undefined' then global else window
root = @

$(document).ready( ->
module("Background.js")
Expand Down
2 changes: 0 additions & 2 deletions ex_client_server/client/config.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ exports.config =
before: [
'vendor/scripts/console-helper.js'
'vendor/scripts/jquery-1.7.2.js'

'vendor/scripts/kmalakoff-client-bundle.js'
'vendor/scripts/kmalakoff-shim.js'
]

stylesheets:
Expand Down
10 changes: 10 additions & 0 deletions ex_client_server/client/easy-bake-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,13 @@ client_bundle:
lifecycle: lifecycle
mixin-js: mixin-js
underscore-awesomer: underscore-awesomer

# unpack some globals for the application
_publish:
underscore: _
backbone: Backbone
backbone-articulation: Backbone.Articulation
knockout: ko
knockback-inspector: kbi
_load:
- underscore
22 changes: 12 additions & 10 deletions ex_client_server/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,18 @@
"expect.js": "0.1.2"
},
"optionalDependencies": {
"underscore": "latest",
"backbone": "latest",
"backbone-articulation": "latest",
"background" : "latest",
"json-serialize" : "latest",
"knockout-client" : "latest",
"knockback" : "latest",
"knockback-inspector" : "latest",
"mixin-js" : "latest",
"underscore-awesomer": "latest"
"underscore": ">=1.3.3",
"backbone": ">=0.9.2",
"backbone-articulation": ">=0.3.1",
"backbone-modelref": ">=0.1.2",
"background": ">=0.2.2",
"json-serialize": ">=1.1.1",
"knockout-client": ">=2.1.0",
"knockback": ">=0.15.3",
"knockback-inspector": ">=0.1.1",
"lifecycle": ">=1.0.1",
"mixin-js": "0.1.3",
"underscore-awesomer": "1.2.1"
},

"version" : "0.0.1"
Expand Down
57 changes: 28 additions & 29 deletions ex_client_server/client/public/javascripts/vendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -9493,25 +9493,25 @@ if ( typeof define === "function" && define.amd && define.amd.jQuery ) {


})( window );
(function() {
// a require implementation doesn't already exist
if (!this.require) {
var root = this;
var modules = {};
this.require = function(module_name) {
if (!modules.hasOwnProperty(module_name)) throw "required module missing: " + module_name;
if (!modules[module_name].exports) {
modules[module_name].exports = {};
modules[module_name].loader.call(root, modules[module_name].exports, this.require, modules[module_name]);
}
return modules[module_name].exports;
};
this.require.define = function(obj) {
for (var module_name in obj) {
modules[module_name] = {loader: obj[module_name]};
};
};
(function() {
// a require implementation doesn't already exist
if (!this.require) {
var root = this;
var modules = {};
this.require = function(module_name) {
if (!modules.hasOwnProperty(module_name)) throw "required module missing: " + module_name;
if (!modules[module_name].exports) {
modules[module_name].exports = {};
modules[module_name].loader.call(root, modules[module_name].exports, this.require, modules[module_name]);
}
return modules[module_name].exports;
};
this.require.define = function(obj) {
for (var module_name in obj) {
modules[module_name] = {loader: obj[module_name]};
};
};
}
this.require.define({
'underscore': function(exports, require, module) {
// Underscore.js 1.3.3
Expand Down Expand Up @@ -16071,7 +16071,7 @@ this.require.define({
__hasProp = {}.hasOwnProperty,
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };

root = typeof window === 'undefined' ? global : window;
root = this;

Background = this.Background = typeof exports !== 'undefined' ? exports : {};

Expand Down Expand Up @@ -16585,7 +16585,7 @@ this.require.define({
(function() {
var JSONS, isArray, isEmpty, keyPath, root, stringHasISO8601DateSignature;

root = typeof window === 'undefined' ? global : window;
root = this;

JSONS = this.JSONS = typeof exports !== 'undefined' ? exports : {};

Expand Down Expand Up @@ -20294,7 +20294,7 @@ this.require.define({

Mixin.AutoMemory || (Mixin.AutoMemory = {});

Mixin.AutoMemory.root = typeof window === 'undefined' ? global : window;
Mixin.AutoMemory.root = this;

Mixin.AutoMemory.WRAPPER = Mixin.AutoMemory.root['$'] ? $ : '$';

Expand Down Expand Up @@ -21267,7 +21267,7 @@ this.require.define({
(function() {
var root, _;

root = typeof window === 'undefined' ? global : window;
root = this;

_ = !this._ && (typeof require !== 'undefined') ? require('underscore')._ : this._;

Expand Down Expand Up @@ -21852,13 +21852,12 @@ this.require.define({

}
});
})(this);(function() {
// unpack some globals for the application
if (!this._) {this._ = require('underscore');}
if (!this.Backbone) {this.Backbone = require('backbone');}
if (!this.Backbone.Articulation) {this.Backbone.Articulation = require('backbone-articulation');}
if (!this.ko) {this.ko = require('knockout');}
if (!this.kbi) {this.kbi = require('knockback-inspector');}
if (!this['_']) {this['_'] = this.require('underscore');}
if (!this['Backbone']) {this['Backbone'] = this.require('backbone');}
if (!this['Backbone.Articulation']) {this['Backbone.Articulation'] = this.require('backbone-articulation');}
if (!this['ko']) {this['ko'] = this.require('knockout');}
if (!this['kbi']) {this['kbi'] = this.require('knockback-inspector');}
this.require('underscore');
})(this);/**
* Backbone-relational.js 0.5.1
* (c) 2011 Paul Uithol
Expand Down
52 changes: 29 additions & 23 deletions ex_client_server/client/vendor/scripts/kmalakoff-client-bundle.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
(function() {
// a require implementation doesn't already exist
if (!this.require) {
var root = this;
var modules = {};
this.require = function(module_name) {
if (!modules.hasOwnProperty(module_name)) throw "required module missing: " + module_name;
if (!modules[module_name].exports) {
modules[module_name].exports = {};
modules[module_name].loader.call(root, modules[module_name].exports, this.require, modules[module_name]);
}
return modules[module_name].exports;
};
this.require.define = function(obj) {
for (var module_name in obj) {
modules[module_name] = {loader: obj[module_name]};
};
};
}
(function() {
// a require implementation doesn't already exist
if (!this.require) {
var root = this;
var modules = {};
this.require = function(module_name) {
if (!modules.hasOwnProperty(module_name)) throw "required module missing: " + module_name;
if (!modules[module_name].exports) {
modules[module_name].exports = {};
modules[module_name].loader.call(root, modules[module_name].exports, this.require, modules[module_name]);
}
return modules[module_name].exports;
};
this.require.define = function(obj) {
for (var module_name in obj) {
modules[module_name] = {loader: obj[module_name]};
};
};
}
this.require.define({
'underscore': function(exports, require, module) {
// Underscore.js 1.3.3
Expand Down Expand Up @@ -6576,7 +6576,7 @@ this.require.define({
__hasProp = {}.hasOwnProperty,
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };

root = typeof window === 'undefined' ? global : window;
root = this;

Background = this.Background = typeof exports !== 'undefined' ? exports : {};

Expand Down Expand Up @@ -7090,7 +7090,7 @@ this.require.define({
(function() {
var JSONS, isArray, isEmpty, keyPath, root, stringHasISO8601DateSignature;

root = typeof window === 'undefined' ? global : window;
root = this;

JSONS = this.JSONS = typeof exports !== 'undefined' ? exports : {};

Expand Down Expand Up @@ -10799,7 +10799,7 @@ this.require.define({

Mixin.AutoMemory || (Mixin.AutoMemory = {});

Mixin.AutoMemory.root = typeof window === 'undefined' ? global : window;
Mixin.AutoMemory.root = this;

Mixin.AutoMemory.WRAPPER = Mixin.AutoMemory.root['$'] ? $ : '$';

Expand Down Expand Up @@ -11772,7 +11772,7 @@ this.require.define({
(function() {
var root, _;

root = typeof window === 'undefined' ? global : window;
root = this;

_ = !this._ && (typeof require !== 'undefined') ? require('underscore')._ : this._;

Expand Down Expand Up @@ -12357,4 +12357,10 @@ this.require.define({

}
});
if (!this['_']) {this['_'] = this.require('underscore');}
if (!this['Backbone']) {this['Backbone'] = this.require('backbone');}
if (!this['Backbone.Articulation']) {this['Backbone.Articulation'] = this.require('backbone-articulation');}
if (!this['ko']) {this['ko'] = this.require('knockout');}
if (!this['kbi']) {this['kbi'] = this.require('knockback-inspector');}
this.require('underscore');
})(this);
20 changes: 10 additions & 10 deletions ex_client_server/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
"express": "2.5.8"
},
"optionalDependencies": {
"underscore": "latest",
"backbone": "latest",
"backbone-articulation": "latest",
"background" : "latest",
"json-serialize" : "latest",
"knockout" : "latest",
"knockback" : "latest",
"knockback-inspector" : "latest",
"mixin-js" : "latest",
"underscore-awesomer": "latest"
"underscore": ">=1.3.3",
"backbone": ">=0.9.2",
"backbone-articulation": ">=0.3.1",
"background": ">=0.2.2",
"json-serialize": ">=1.1.1",
"knockout": ">=2.1.0",
"knockback": ">=0.15.3",
"knockback-inspector": ">=0.1.1",
"mixin-js": "0.1.3",
"underscore-awesomer": "1.2.1"
},

"version" : "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion ex_json_serialize_js/test.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root = if typeof(window) == 'undefined' then global else window
root = @

$(document).ready( ->
module("JSON-Serialize.js")
Expand Down
2 changes: 1 addition & 1 deletion ex_mixin_js/test.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root = if typeof(window) == 'undefined' then global else window
root = @

$(document).ready( ->
module("Mixin.js")
Expand Down
2 changes: 1 addition & 1 deletion examples_lib/build/examples_lib.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples_lib/localized_string.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root = if typeof(window) == 'undefined' then global else window
root = @
root.ENV||root.ENV={}

class LocalizedString
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"author" : {"name": "Kevin Malakoff", "url": "https://github.com/kmalakoff"},
"name" : "examples-kmalakoff_dev",
"name" : "_examples-kmalakoff",
"description" : "Working code examples using repositories at https://github.com/kmalakoff",
"keywords" : ["examples", "kmalakoff", "javascript", "coffeescript", "knockback", "knockbackjs", "knockback-inspector", "knockbackjs-inspector", "backbone", "backbonejs", "backbone-articulation", "backbone-articulationjs", "background", "backgroundjs", "mixin", "mixinjs", "underscore", "underscore-awesomer", "underscore-awesomerjs"],

Expand All @@ -17,20 +17,20 @@
"test": "cake -c -b test"
},
"optionalDependencies" : {
"underscore": "latest",
"backbone": "latest",
"underscore": ">=1.3.3",
"backbone": ">=0.9.2",

"backbone-articulation": "latest",
"backbone-modelref": "latest",
"backbone-relational": "latest",
"background": "latest",
"json-serialize": "latest",
"knockout-client": "latest",
"knockback": "latest",
"knockback-inspector": "latest",
"lifecycle": "latest",
"mixin-js": "latest",
"underscore-awesomer": "latest"
"backbone-articulation": ">=0.3.1",
"backbone-modelref": ">=0.1.2",
"backbone-relational": ">=0.5.0",
"background": ">=0.2.2",
"json-serialize": ">=1.1.1",
"knockout-client": ">=2.1.0",
"knockback": ">=0.15.3",
"knockback-inspector": ">=0.1.1",
"lifecycle": ">=1.0.1",
"mixin-js": "0.1.3",
"underscore-awesomer": "1.2.1"
},

"version" : "0.0.1"
Expand Down
2 changes: 1 addition & 1 deletion vendor/background-latest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/json-serialize-latest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/mixin-js-latest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/underscore-awesomer-latest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f7b688f

Please sign in to comment.