Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-08 02:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename getValue to result.

Browse Source
This commit is contained in:
Brad Dunbar
2012-03-19 14:33:38 -04:00
parent d0e7b397c1
commit 5c7ccb21ef
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
index.html
View File

@@ -245,7 +245,7 @@
<li>- <a href="#mixin">mixin</a></li> <li>- <a href="#mixin">mixin</a></li>
<li>- <a href="#uniqueId">uniqueId</a></li> <li>- <a href="#uniqueId">uniqueId</a></li>
<li>- <a href="#escape">escape</a></li> <li>- <a href="#escape">escape</a></li>
<li>- <a href="#getValue">getValue</a></li> <li>- <a href="#result">result</a></li>
<li>- <a href="#template">template</a></li> <li>- <a href="#template">template</a></li>
</ul> </ul>
@@ -1310,16 +1310,16 @@ _.uniqueId('contact_');
_.escape('Curly, Larry &amp; Moe'); _.escape('Curly, Larry &amp; Moe');
=&gt; "Curly, Larry &amp;amp; Moe"</pre> =&gt; "Curly, Larry &amp;amp; Moe"</pre>
<p id="getValue"> <p id="result">
<b class="header">getValue</b><code>_.getValue(object, property)</code> <b class="header">result</b><code>_.result(object, property)</code>
<br /> <br />
Returns a value from an object as a property or as a function. Returns a value from an object as a property or as a function.
</p> </p>
<pre> <pre>
var object = {cheese: 'crumpets', stuff: function(){ return 'nonsense'; }}; var object = {cheese: 'crumpets', stuff: function(){ return 'nonsense'; }};
_.getValue(object, 'cheese'); _.result(object, 'cheese');
=&gt; "crumpets" =&gt; "crumpets"
_.getValue(object, 'stuff'); _.result(object, 'stuff');
=&gt; "nonsense"</pre> =&gt; "nonsense"</pre>
<p id="template"> <p id="template">

12
test/utility.js
View File

@@ -165,13 +165,13 @@ $(document).ready(function() {
strictEqual(tmpl(), '<p>\u2028\u2028\u2029\u2029</p>'); strictEqual(tmpl(), '<p>\u2028\u2028\u2029\u2029</p>');
}); });
test('getValue calls functions and returns primitives', function() { test('result calls functions and returns primitives', function() {
var obj = {w: '', x: 'x', y: function(){ return 'y'; }}; var obj = {w: '', x: 'x', y: function(){ return 'y'; }};
strictEqual(_.getValue(obj, 'w'), ''); strictEqual(_.result(obj, 'w'), '');
strictEqual(_.getValue(obj, 'x'), 'x'); strictEqual(_.result(obj, 'x'), 'x');
strictEqual(_.getValue(obj, 'y'), 'y'); strictEqual(_.result(obj, 'y'), 'y');
strictEqual(_.getValue(obj, 'z'), undefined); strictEqual(_.result(obj, 'z'), undefined);
strictEqual(_.getValue(null, 'x'), null); strictEqual(_.result(null, 'x'), null);
}); });
}); });

2
underscore.js
View File

@@ -874,7 +874,7 @@
}; };
// Get a value from an object as a property or as a function. // Get a value from an object as a property or as a function.
_.getValue = function(object, prop) { _.result = function(object, prop) {
if (object == null) return null; if (object == null) return null;
var value = object[prop]; var value = object[prop];
return _.isFunction(value) ? value() : value; return _.isFunction(value) ? value() : value;