Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow version 1.3.1 to work in strict mode #157

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow version 1.3.1 to work in strict mode #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf40884
Strict mode initial compatibility work, but needs NodeJS support (win…
timcurzon Aug 1, 2017
c5ca47f
Strict mode compatibility support added for NodeJS
timcurzon Aug 1, 2017
a8768f9
Minor code formatting amendment
timcurzon Aug 1, 2017
75d35af
Environment utility (env) moved to seperate directory
timcurzon Aug 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 76 additions & 53 deletions nestedtypes.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion nestedtypes.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var Remove = require( './collections/remove' ),
removeOne = Remove.removeOne,
removeMany = Remove.removeMany;

CollectionProto = Backbone.Collection.prototype;
var CollectionProto = Backbone.Collection.prototype;

// transactional wrapper for collections
function transaction( func ){
Expand Down Expand Up @@ -310,4 +310,4 @@ module.exports = Backbone.Collection.extend( {
This.__subsetOf = null;
return This;
}
} );
} );
5 changes: 3 additions & 2 deletions src/metatypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ var attribute = require( './attribute' ),
modelSet = require( './modelset' ),
Model = require( './model' ),
errors = require( './errors' ),
Collection = require( './collection' );
Collection = require( './collection' ),
GlobalEnv = require( './utils/env' );

// Constructors Attribute
// ----------------
Expand Down Expand Up @@ -84,7 +85,7 @@ attribute.Type.extend( {
// ----------------
// Global Mock for missing Integer data type...
// -------------------------------------
Integer = function( x ){ return x ? Math.round( x ) : 0; };
GlobalEnv.Integer = function( x ){ return x ? Math.round( x ) : 0; };

var PrimitiveType = attribute.Type.extend( {
create : function(){ return this.type(); },
Expand Down
6 changes: 3 additions & 3 deletions src/object+.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@
}

function define( a_protoProps, a_staticProps ){
var protoProps = a_protoProps || {};
staticProps = a_staticProps || {};
var protoProps = a_protoProps || {};
var staticProps = a_staticProps || {};

if( protoProps.mixins ){
protoProps = attachMixins( protoProps );
Expand Down Expand Up @@ -238,4 +238,4 @@
})()
} );

module.exports = Object.extend.Class;
module.exports = Object.extend.Class;
Loading