Release v2.4.1

linkedin · Sep 2, 2014 · 8bc0b85 · 8bc0b85
1 parent d601153
commit 8bc0b85
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 52 deletions.
diff --git a/archive/dust-2.4.1.tar.gz b/archive/dust-2.4.1.tar.gz
diff --git a/archive/dust-2.4.1.zip b/archive/dust-2.4.1.zip
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "dustjs-linkedin",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "main": "dist/dust-full.min.js",
   "devDependencies": {
     "pegjs": "0.7.0"

diff --git a/dist/dust-core.js b/dist/dust-core.js
@@ -1,4 +1,4 @@
-/*! Dust - Asynchronous Templating - v2.4.0
+/*! Dust - Asynchronous Templating - v2.4.1
 * http://linkedin.github.io/dustjs/
 * Copyright (c) 2014 Aleksander Williams; Released under the MIT License */
 (function(root) {
@@ -12,27 +12,10 @@
       EMPTY_FUNC = function() {},
       logger = {},
       originalLog,
-      loggerContext,
-      hasOwnProperty = Object.prototype.hasOwnProperty,
-      getResult;
+      loggerContext;
 
   dust.debugLevel = NONE;
 
-  /**
-   * Given an object and a key, return the value. Use this instead of obj[key] in order to:
-   *     prevent looking up the prototype chain
-   *     fail nicely when the object is falsy
-   * @param {Object} obj the object to inspect
-   * @param {String} key the name of the property to resolve
-   * @return {*} the resolved value
-   */
-  getResult = function(obj, key) {
-    if (obj && hasOwnProperty.call(obj, key)) {
-      return obj[key];
-    }
-  };
-
-
   // Try to find the console in global scope
   if (root && root.console && root.console.log) {
     loggerContext = root.console;
@@ -327,7 +310,7 @@
         while (ctx) {
           if (ctx.isObject) {
             ctxThis = ctx.head;
-            value = getResult(ctx.head, first);
+            value = ctx.head[first];
             if (value !== undefined) {
               break;
             }
@@ -338,16 +321,21 @@
         if (value !== undefined) {
           ctx = value;
         } else {
-          ctx = getResult(this.global, first);
+          ctx = this.global ? this.global[first] : undefined;
         }
       } else if (ctx) {
         // if scope is limited by a leading dot, don't search up the tree
-        ctx = getResult(ctx.head, first);
+        if(ctx.head) {
+          ctx = ctx.head[first];
+        } else {
+          //context's head is empty, value we are searching for is not defined
+          ctx = undefined;
+        }
       }
 
       while (ctx && i < len) {
         ctxThis = ctx;
-        ctx = getResult(ctx, down[i]);
+        ctx = ctx[down[i]];
         i++;
       }
     }

diff --git a/dist/dust-core.min.js b/dist/dust-core.min.js
diff --git a/dist/dust-full.js b/dist/dust-full.js
@@ -1,4 +1,4 @@
-/*! Dust - Asynchronous Templating - v2.4.0
+/*! Dust - Asynchronous Templating - v2.4.1
 * http://linkedin.github.io/dustjs/
 * Copyright (c) 2014 Aleksander Williams; Released under the MIT License */
 (function(root) {
@@ -12,27 +12,10 @@
       EMPTY_FUNC = function() {},
       logger = {},
       originalLog,
-      loggerContext,
-      hasOwnProperty = Object.prototype.hasOwnProperty,
-      getResult;
+      loggerContext;
 
   dust.debugLevel = NONE;
 
-  /**
-   * Given an object and a key, return the value. Use this instead of obj[key] in order to:
-   *     prevent looking up the prototype chain
-   *     fail nicely when the object is falsy
-   * @param {Object} obj the object to inspect
-   * @param {String} key the name of the property to resolve
-   * @return {*} the resolved value
-   */
-  getResult = function(obj, key) {
-    if (obj && hasOwnProperty.call(obj, key)) {
-      return obj[key];
-    }
-  };
-
-
   // Try to find the console in global scope
   if (root && root.console && root.console.log) {
     loggerContext = root.console;
@@ -327,7 +310,7 @@
         while (ctx) {
           if (ctx.isObject) {
             ctxThis = ctx.head;
-            value = getResult(ctx.head, first);
+            value = ctx.head[first];
             if (value !== undefined) {
               break;
             }
@@ -338,16 +321,21 @@
         if (value !== undefined) {
           ctx = value;
         } else {
-          ctx = getResult(this.global, first);
+          ctx = this.global ? this.global[first] : undefined;
         }
       } else if (ctx) {
         // if scope is limited by a leading dot, don't search up the tree
-        ctx = getResult(ctx.head, first);
+        if(ctx.head) {
+          ctx = ctx.head[first];
+        } else {
+          //context's head is empty, value we are searching for is not defined
+          ctx = undefined;
+        }
       }
 
       while (ctx && i < len) {
         ctxThis = ctx;
-        ctx = getResult(ctx, down[i]);
+        ctx = ctx[down[i]];
         i++;
       }
     }

diff --git a/dist/dust-full.min.js b/dist/dust-full.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dustjs-linkedin",
   "title": "Dust - Asynchronous Templating",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "author": {
     "name": "Aleksander Williams",
     "url": "http://akdubya.github.com/dustjs"