Skip to content

Commit

Permalink
Build dist/ for 2.4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
tnhu committed May 27, 2015
1 parent 7858c68 commit 4a0e8b3
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 24 deletions.
6 changes: 3 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = function(grunt) {
pkg: grunt.file.readJSON('package.json'),

qunit: {
all: [ 'test/*.html' ]
all: [ 'test/index.html' ]
},

watch: {
Expand All @@ -13,7 +13,7 @@ module.exports = function(grunt) {

uglify: {
options: {
report: 'gzip',
compress: { warnings: false },
banner: '/*\n * JSFace Object Oriented Programming Library.\n * Copyright (c) Tan Nhu, http://lnkd.in/tnhu\n */\n'
},
my_target: {
Expand Down Expand Up @@ -42,4 +42,4 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-clean');

grunt.registerTask('default', [ 'clean', 'qunit', 'copy', 'uglify' ]);
};
};
11 changes: 6 additions & 5 deletions dist/jsface.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,16 @@
parent = (api = parent, 0); // !api means there's no parent
}

// TODO remove $statics, use $static instead
var clazz, constructor, singleton, statics, key, bindTo, len, i = 0, p,
ignoredKeys = { constructor: 1, $singleton: 1, $statics: 1, prototype: 1, $super: 1, $superp: 1, main: 1, toString: 0 },
ignoredKeys = { constructor: 1, $singleton: 1, $static:1, $statics: 1, prototype: 1, $super: 1, $superp: 1, main: 1, toString: 0 },
plugins = Class.plugins,
rootParent, parentClass, Stub;

api = (typeof api === "function" ? api() : api) || {}; // execute api if it's a function
constructor = api.hasOwnProperty("constructor") ? api.constructor : 0; // hasOwnProperty is a must, constructor is special
singleton = api.$singleton;
statics = api.$statics;
statics = api.$statics || api.$static;

// add plugins' keys into ignoredKeys
for (key in plugins) { ignoredKeys[key] = 1; }
Expand All @@ -127,7 +128,7 @@

Stub.prototype = parentClass.prototype;
Stub.prototype.constructor = Stub;
clazz.prototype = new Stub;
clazz.prototype = new Stub();
clazz.prototype.constructor = clazz; // restoring proper constructor for child class
parentClass.prototype.constructor = parentClass; // restoring proper constructor for parent class
}
Expand All @@ -146,7 +147,7 @@
clazz[key] = p[key];
}
}
if ( !singleton && i != 0) {
if ( !singleton && i !== 0) {
for (key in p.prototype) {
if ( !ignoredKeys[key]) {
bindTo[key] = p.prototype[key];
Expand Down Expand Up @@ -241,4 +242,4 @@
context.jsface = jsface;
jsface.noConflict = function() { context.Class = oldClass; }; // no conflict
}
})(this, "object", "number", "length", Object.prototype.toString, [], 0);
})(this, "object", "number", "length", Object.prototype.toString, [], 0);
13 changes: 3 additions & 10 deletions dist/jsface.min.js

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

9 changes: 3 additions & 6 deletions dist/jsface.pointcut.min.js

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

0 comments on commit 4a0e8b3

Please sign in to comment.