Skip to content
Browse files

renamed Shrike.object to Shrike.inherit

  • Loading branch information...
1 parent 48cde13 commit afce77af4fffcb0755aeb18ffe96201db1e82c4c @alpha123 committed May 22, 2011
Showing with 5 additions and 5 deletions.
  1. +4 −4 docs/core.html
  2. +1 −1 src/core.js
View
8 docs/core.html
@@ -55,7 +55,7 @@
<li><a href="#Shrike-merge">Shrike.merge</a></li>
<li><a href="#Shrike-extend">Shrike.extend</a></li>
<li><a href="#Shrike-clone">Shrike.clone</a></li>
- <li><a href="#Shrike-object">Shrike.object</a></li>
+ <li><a href="#Shrike-inherit">Shrike.inherit</a></li>
<li><a href="#Shrike-first">Shrike.first</a></li>
<li><a href="#Shrike-inspect">Shrike.inspect</a></li>
<li><a href="#Shrike-toQueryString">Shrike.toQueryString</a></li>
@@ -140,8 +140,8 @@ <h3 class="exhead">Example</h3>
// obj2.strange: "fish"
</pre>
</li>
- <li id="Shrike-object">
- <h2 class="name">Shrike.object</h2>
+ <li id="Shrike-inherit">
+ <h2 class="name">Shrike.inherit</h2>
<span class="desc">Untangles JavaScript&apos;s inheritance mechanism. See
<a href="http://javascript.crockford.com/prototypal.html">http://javascript.crockford.com/prototypal.html</a>. Essentially creates a
new object that inherits from the passed object.</span>
@@ -154,7 +154,7 @@ <h3 class="rethead">Returns</h3>
<h3 class="exhead">Example</h3>
<pre class="ex">
var obj = {hello: function () { return 'Hello'; }},
- newObj = Shrike.object(obj);
+ newObj = Shrike.inherit(obj);
newObj.hey = function () { return 'Hey!'; };
newObj.hello(); // "Hello"
</pre>
View
2 src/core.js
@@ -163,7 +163,7 @@ Shrike.merge(Shrike, {
},
// From http://javascript.crockford.com/prototypal.html
- object: function (obj) {
+ inherit: function (obj) {
function F() { }
F.prototype = obj;
return new F();

0 comments on commit afce77a

Please sign in to comment.
Something went wrong with that request. Please try again.