Skip to content

Commit

Permalink
Update dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bram Stein committed May 24, 2014
1 parent 5732a32 commit 3e9ed92
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 71 deletions.
20 changes: 10 additions & 10 deletions package.json
Expand Up @@ -10,18 +10,18 @@
"author": "Bram Stein <b.l.stein@gmail.com> (http://www.bramstein.com)",
"license": "BSD",
"devDependencies": {
"expect.js": "~0.2.0",
"grunt-contrib-clean": "~0.5.0",
"mocha": "~1.12.0",
"assetgraph-builder": "~1.8.2",
"browserstack-test": "~0.2.10",
"expect.js": "^0.3.1",
"extend": "^1.2.1",
"grunt": "~0.4.1",
"grunt-closurecompiler": "~0.9.5",
"extend": "~1.1.3",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-connect": "^0.7.1",
"grunt-contrib-copy": "^0.5.0",
"grunt-exec": "~0.4.2",
"grunt-contrib-connect": "~0.5.0",
"mocha-browserstack": "~0.2.1",
"browserstack-test": "~0.2.10",
"localtunnel": "~0.1.3",
"assetgraph-builder": "~1.8.2",
"grunt-contrib-copy": "~0.4.1"
"localtunnel": "^1.3.0",
"mocha": "^1.19.0",
"mocha-browserstack": "~0.2.1"
}
}
4 changes: 2 additions & 2 deletions test/index.html
Expand Up @@ -10,7 +10,7 @@
<script>CLOSURE_NO_DEPS = true;</script>
<script src="../vendor/google/base.js"></script>
<script src="../node_modules/mocha/mocha.js"></script>
<script src="../node_modules/expect.js/expect.js"></script>
<script src="../node_modules/expect.js/index.js"></script>
<script src="../node_modules/mocha-browserstack/lib/mocha-browserstack.js"></script>
<script src="deps.js"></script>
<script>
Expand All @@ -25,7 +25,7 @@
<script>
window.onload = function () {
mocha.run();
};
};
</script>
</body>
</html>
59 changes: 0 additions & 59 deletions vendor/google/base.js
Expand Up @@ -1473,65 +1473,6 @@ goog.inherits = function(childCtor, parentCtor) {
childCtor.prototype.constructor = childCtor;
};


/**
* Call up to the superclass.
*
* If this is called from a constructor, then this calls the superclass
* contructor with arguments 1-N.
*
* If this is called from a prototype method, then you must pass
* the name of the method as the second argument to this function. If
* you do not, you will get a runtime error. This calls the superclass'
* method with arguments 2-N.
*
* This function only works if you use goog.inherits to express
* inheritance relationships between your classes.
*
* This function is a compiler primitive. At compile-time, the
* compiler will do macro expansion to remove a lot of
* the extra overhead that this function introduces. The compiler
* will also enforce a lot of the assumptions that this function
* makes, and treat it as a compiler error if you break them.
*
* @param {!Object} me Should always be "this".
* @param {*=} opt_methodName The method name if calling a super method.
* @param {...*} var_args The rest of the arguments.
* @return {*} The return value of the superclass method.
*/
goog.base = function(me, opt_methodName, var_args) {
var caller = arguments.callee.caller;
if (caller.superClass_) {
// This is a constructor. Call the superclass constructor.
return caller.superClass_.constructor.apply(
me, Array.prototype.slice.call(arguments, 1));
}

var args = Array.prototype.slice.call(arguments, 2);
var foundCaller = false;
for (var ctor = me.constructor;
ctor; ctor = ctor.superClass_ && ctor.superClass_.constructor) {
if (ctor.prototype[opt_methodName] === caller) {
foundCaller = true;
} else if (foundCaller) {
return ctor.prototype[opt_methodName].apply(me, args);
}
}

// If we did not find the caller in the prototype chain,
// then one of two things happened:
// 1) The caller is an instance method.
// 2) This method was not called by the right caller.
if (me[opt_methodName] === caller) {
return me.constructor.prototype[opt_methodName].apply(me, args);
} else {
throw Error(
'goog.base called from a method of one name ' +
'to a method of a different name');
}
};


/**
* Allow for aliasing within scope functions. This function exists for
* uncompiled code - in compiled code the calls will be inlined and the
Expand Down

0 comments on commit 3e9ed92

Please sign in to comment.