Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/node_modules/montage/data/pledge.js b/node_modules/montage/data/pledge.js
index 49cb0441..d75f6440 100755
--- a/node_modules/montage/data/pledge.js
+++ b/node_modules/montage/data/pledge.js
@@ -10,13 +10,13 @@
  @requires montage/core/logger
  */
 var Montage = require("montage").Montage;
-var Q = require("core/promise");
+var Promise = require("core/promise").Promise;
 var logger = require("core/logger").logger("pledge");
 /**
  @class module:montage/data/pledge.Pledge
- @extends module:montage/core/core.Montage
+ @extends module:montage/core/promise.Promise
  */
-var Pledge = exports.Pledge = Montage.create(Montage, /** @lends module:montage/data/pledge.Pledge# */ {
+var Pledge = exports.Pledge = Montage.create(Promise, /** @lends module:montage/data/pledge.Pledge# */ {
 
     /**
      Description TODO
@@ -200,11 +200,11 @@ var PledgedSortedSet = exports.PledgedSortedSet = Montage.create(Pledge, /** @le
      Checks if the pledged array is empty.<br/>
      <b>Note:</b> This value is not constant as depending upon the type of backing store, the number of objects returned may vary over time.
      @function
-     @returns {Boolean} <code>true</code> if the array is not empty, <code>false</code> otherwise.
+     @returns {Boolean} <code>true</code> if the array is empty, <code>false</code> otherwise.
      */
     empty: {
         value: function () {
-            return length == 0;
+            return this.length() == 0;
         }
     },