sproutcore 1.0.1003 → 1.0.1008

data/frameworks/sproutcore/frameworks/runtime/system/logger.js

@@ -0,0 +1,408 @@
+// ==========================================================================
+// SC.Logger
+// ==========================================================================
+
+
+/**
+  If {@link SC.Logger.format} is true, this delimiter will be put between arguments.
+  
+  @property {String}
+*/
+SC.LOGGER_LOG_DELIMITER = ", ";
+
+/**
+  If {@link SC.Logger.error} falls back onto {@link SC.Logger.log}, this will be
+  prepended to the output.
+  
+  @property {String}
+*/
+SC.LOGGER_LOG_ERROR = "ERROR: ";
+
+/**
+  If {@link SC.Logger.info} falls back onto {@link SC.Logger.log}, this will be
+  prepended to the output.
+  
+  @property {String}
+*/
+SC.LOGGER_LOG_INFO = "INFO: ";
+
+/**
+  If {@link SC.Logger.warn} falls back onto {@link SC.Logger.log}, this will be
+  prepended to the output.
+  
+  @property {String}
+*/
+SC.LOGGER_LOG_WARN = "WARNING: ";
+
+/** @class
+  
+  Object to allow for safe logging actions, such as using the browser console.
+  
+  The FireFox plugin Firebug was used as a function reference. Please see
+  {@link <a href="http://getfirebug.com/logging.html">Firebug Logging Reference</a>}
+  for further information.
+  
+  @author Colin Campbell
+  @extends SC.Object
+  @since Sproutcore 1.0
+  @see <a href="http://getfirebug.com/logging.html">Firebug Logging Reference</a>
+*/
+SC.Logger = SC.Object.create({ 
+  
+  // ..........................................................
+  // PROPERTIES
+  //   
+  
+  /**
+    Computed property that checks for the existence of the reporter object.
+    
+    @property {Boolean}
+  */
+  exists: function() {
+    return typeof(this.get('reporter')) !== 'undefined' && this.get('reporter') != null;
+  }.property('reporter').cacheable(),
+  
+  /**
+    If console.log does not exist, SC.Logger will use window.alert instead.
+    
+    This property is only used inside {@link SC.Logger.log}. If fallBackOnLog is
+    false and you call a different function, an alert will not be opened.
+    
+    @property {Boolean}
+  */
+  fallBackOnAlert: NO,
+  
+  /**
+    If some function, such as console.dir, does not exist,
+    SC.Logger will try console.log if this is true.
+    
+    @property {Boolean}
+  */
+  fallBackOnLog: YES,
+  
+  /**
+    Whether or not to format multiple arguments together
+    or let the browser deal with that.
+    
+    @property {Boolean}
+  */
+  format: YES,
+  
+  /**
+    The reporter is the object which implements the actual logging functions.
+    
+    @default The browser's console
+    @property {Object}
+  */
+  reporter: console,
+  
+  // ..........................................................
+  // METHODS
+  // 
+
+  /**
+    Log output to the console, but only if it exists.
+    
+    @param {String|Array|Function|Object}
+    @returns {Boolean} true if reporter.log exists, false otherwise
+  */
+  log: function() {
+    var reporter = this.get('reporter');
+    
+    // log through the reporter
+    if (this.get('exists') && typeof(reporter.log) === "function") {
+      if (this.get('format')) {
+        reporter.log(this._argumentsToString.apply(this, arguments));
+      }
+      else {
+        reporter.log.apply(reporter, arguments);
+      }
+      return true;
+    }
+    
+    // log through alert
+    else if (this.fallBackOnAlert) {
+      var s = this.get('format') ? this._argumentsToString.apply(this, arguments) : arguments;
+      // include support for overriding the alert through the reporter
+      // if it has come this far, it's likely this will fail
+      if (this.get('exists') && typeof(reporter.alert) === "function") {
+        reporter.alert(s);
+      }
+      else {
+        alert(s);
+      }
+      return true;
+    }
+    return false;
+  },
+  
+  /**
+    Prints the properties of an object.
+    
+    Logs the object using {@link SC.Logger.log} if the reporter.dir function does not exist and
+    {@link SC.Logger.fallBackOnLog} is true.
+    
+    @param {Object}
+    @returns {Boolean} true if logged to console, false if not
+  */
+  dir: function() {
+    var reporter = this.get('reporter');
+    
+  	if (this.get('exists') && typeof(reporter.dir) === "function") {
+      // Firebug's console.dir doesn't support multiple objects here
+      // but maybe custom reporters will
+  	  reporter.dir.apply(reporter, arguments);
+  	  return true;
+	  }
+  	return (this.fallBackOnLog) ? this.log.apply(this, arguments) : false;
+  },
+  
+  /**
+    Prints an XML outline for any HTML or XML object.
+    
+    Logs the object using {@link SC.Logger.log} if reporter.dirxml function does not exist and
+    {@lnk SC.Logger.fallBackOnLog} is true.
+    
+    @param {Object}
+    @returns {Boolean} true if logged to reporter, false if not
+  */
+  dirxml: function() {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.dirxml) === "function") {
+      // Firebug's console.dirxml doesn't support multiple objects here
+      // but maybe custom reporters will
+      reporter.dirxml.apply(reporter, arguments);
+      return true;
+    }
+    return (this.fallBackOnLog) ? this.log.apply(this, arguments) : false;
+  },
+  
+  /**
+    Log an error to the console
+    
+    Logs the error using {@link SC.Logger.log} if reporter.error does not exist and
+    {@link SC.Logger.fallBackOnLog} is true.
+    
+    @param {String|Array|Function|Object}
+    @returns {Boolean} true if logged to reporter, false if not
+  */
+  error: function() {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.error) === "function") {
+      reporter.error.apply(reporter, arguments);
+      return true;
+    }
+    else if (this.fallBackOnLog) {
+      var a = this._argumentsToArray(arguments);
+      if (typeof(a.unshift) === "function") a.unshift(SC.LOGGER_LOG_ERROR);
+      return this.log.apply(this, a);
+    }
+    return false;
+  },
+  
+  /**
+    Every log after this call until {@link SC.Logger.groupEnd} is called
+    will be indented for readability. You can create as many levels
+    as you want.
+    
+    @param {String} [title] An optional title to display above the group
+    @returns {Boolean} true if reporter.group exists, false otherwise
+  */
+  group: function(s) {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.group) === "function") {
+      reporter.group(s);
+      return true;
+    }
+    return false;
+  },
+  
+  /**
+    Ends a group declared with {@link SC.Logger.group}.
+    
+    @returns {Boolean} true if the reporter.groupEnd exists, false otherwise
+    @see SC.Logger.group
+  */
+  groupEnd: function() {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.groupEnd) === "function") {
+      reporter.groupEnd();
+      return true;
+    }
+    return false;
+  },
+  
+  /**
+    Log an information response to the reporter.
+    
+    Logs the response using {@link SC.Logger.log} if reporter.info does not exist and
+    {@link SC.Logger.fallBackOnLog} is true.
+    
+    @param {String|Array|Function|Object}
+    @returns {Boolean} true if logged to reporter, false if not
+  */
+  info: function() {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.info) === "function") {
+      reporter.info.apply(reporter, arguments);
+      return true;
+    }
+    else if (this.fallBackOnLog) {
+      var a = this._argumentsToArray(arguments);
+      if (typeof(a.unshift) === "function") a.unshift(SC.LOGGER_LOG_INFO);
+      return this.log.apply(this, a);
+    }
+    return false;
+  },
+  
+  /**
+    Begins the JavaScript profiler, if it exists. Call {@link SC.Logger.profileEnd}
+    to end the profiling process and receive a report.
+    
+    @returns {Boolean} true if reporter.profile exists, false otherwise
+  */
+  profile: function() {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.profile) === "function") {
+      reporter.profile();
+      return true;
+    }
+    return false;
+  },
+  
+  /**
+    Ends the JavaScript profiler, if it exists.
+    
+    @returns {Boolean} true if reporter.profileEnd exists, false otherwise
+    @see SC.Logger.profile
+  */
+  profileEnd: function() {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.profileEnd) === "function") {
+      reporter.profileEnd();
+      return true;
+    }
+    return false;
+  },
+  
+  /**
+    Measure the time between when this function is called and
+    {@link SC.Logger.timeEnd} is called.
+    
+    @param {String} name The name of the profile to begin
+    @returns {Boolean} true if reporter.time exists, false otherwise
+    @see SC.Logger.timeEnd
+  */
+  time: function(name) {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.time) === "function") {
+      reporter.time(name);
+      return true;
+    }
+    return false;
+  },
+  
+  /**
+    Ends the profile specified.
+    
+    @param {String} name The name of the profile to end
+    @returns {Boolean} true if reporter.timeEnd exists, false otherwise
+    @see SC.Logger.time
+  */
+  timeEnd: function(name) {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.timeEnd) === "function") {
+      reporter.timeEnd(name);
+      return true;
+    }
+    return false;
+  },
+  
+  /**
+    Prints a stack-trace.
+    
+    @returns {Boolean} true if reporter.trace exists, false otherwise
+  */
+  trace: function() {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.trace) === "function") {
+      reporter.trace();
+      return true;
+    }
+    return false;
+  },
+  
+  /**
+    Log a warning to the console.
+    
+    Logs the warning using {@link SC.Logger.log} if reporter.warning does not exist and
+    {@link SC.Logger.fallBackOnLog} is true.
+    
+    @param {String|Array|Function|Object}
+    @returns {Boolean} true if logged to reporter, false if not
+  */
+  warn: function() {
+    var reporter = this.get('reporter');
+    
+    if (this.get('exists') && typeof(reporter.warn) === "function") {
+      reporter.warn.apply(reporter, arguments);
+      return true;
+    }
+    else if (this.fallBackOnLog) {
+      var a = this._argumentsToArray(arguments);
+      if (typeof(a.unshift) === "function") a.unshift(SC.LOGGER_LOG_WARN);
+      return this.log.apply(this, a);
+    }
+    return false;
+  },
+  
+  // ..........................................................
+  // INTERNAL SUPPORT
+  // 
+  
+  /**
+    @private
+    
+    The arguments function property doesn't support Array#unshift. This helper
+    copies the elements of arguments to a blank array.
+    
+    @param {Array} arguments The arguments property of a function
+    @returns {Array} An array containing the elements of arguments parameter
+  */
+  _argumentsToArray: function(arguments) {
+    if (!arguments) return [];
+    var a = [];
+    for (var i = 0; i < arguments.length; i++) {
+      a[i] = arguments[i];
+    }
+    return a;
+  },
+  
+  /**
+    @private
+    
+    Formats the arguments array of a function by creating a string
+    with SC.LOGGER_LOG_DELIMITER between the elements.
+    
+    @returns {String} A string of formatted arguments
+  */
+  _argumentsToString: function() {
+  	var s = "";
+  	for (var i = 0; i<arguments.length - 1; i++) {
+  		s += arguments[i] + SC.LOGGER_LOG_DELIMITER;
+  	}
+  	s += arguments[arguments.length-1];
+  	return s;
+  }
+  
+});

data/frameworks/sproutcore/frameworks/runtime/system/object.js

@@ -121,7 +121,7 @@ SC._object_extend = function _object_extend(base, ext) {
         while(--pathLoc >= 0) {
           local = base._kvo_for(SC.keyFor('_kvo_local', paths[pathLoc]), SC.Set);
           local.add(key);
-          base._kvo_for('_kvo_observed_keys', SC.Set).add(paths[pathLoc]) ;
+          base._kvo_for('_kvo_observed_keys', SC.CoreSet).add(paths[pathLoc]);
         }
 
       // handle computed properties
@@ -145,6 +145,20 @@ SC._object_extend = function _object_extend(base, ext) {
     // copy property
     base[key] = value ;
   }
+  
+  // Manually set base on toString() because some JS engines (such as IE8) do
+  // not enumerate it
+  if (ext.hasOwnProperty('toString')) {
+    key = 'toString';
+    // get the value.  use concats if defined
+    value = (concats.hasOwnProperty(key) ? concats[key] : null) || ext[key] ;
+    if (!value.superclass && (value !== (cur=base[key]))) {
+      value.superclass = value.base = cur || K ;
+    }
+    // copy property
+    base[key] = value ;
+  }
+
 
   // copy bindings, observers, and properties 
   base._bindings = bindings || [];
@@ -152,9 +166,6 @@ SC._object_extend = function _object_extend(base, ext) {
   base._properties = properties || [] ;
   base.outlets = outlets || [];
 
-  // toString is usually skipped.  Don't do that!
-  if (ext.hasOwnProperty('toString')) base.toString = ext.toString;
-
   return base ;
 } ;
 

data/frameworks/sproutcore/frameworks/runtime/system/selection_set.js

@@ -86,6 +86,9 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
     // try to find in cache
     if (!cache) cache = this._indexSetCache = {};
     ret = cache[SC.guidFor(source)];
+    if (ret && ret._sourceRevision && (ret._sourceRevision !== source.propertyRevision)) {
+      ret = null;
+    }
 
     // not in cache.  generate from index sets and any saved objects
     if (!ret) {
@@ -102,7 +105,10 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
         }, this);
       }
       
-      if (ret) ret = cache[SC.guidFor(source)] = ret.frozenCopy();
+      if (ret) {
+        ret = cache[SC.guidFor(source)] = ret.frozenCopy();
+        ret._sourceRevision = source.propertyRevision;
+      }
     }
     
     return ret;
@@ -241,14 +247,36 @@ SC.SelectionSet = SC.Object.extend(SC.Enumerable, SC.Freezable, SC.Copyable,
       }
     }
     
+    // save starter info
     set    = this._indexSetForSource(source, YES);
     oldlen = this.get('length');
     newlen = oldlen - set.get('length');
-        
+
+    // if we have objects selected, determine if they are in the index 
+    // set and remove them as well.
+    if (set && (objects = this._objects)) {
+      
+      // convert start/length to index set so the iterator below will work...
+      if (length !== undefined) {
+        start = SC.IndexSet.create(start, length);
+        length = undefined;
+      }
+      
+      objects.forEach(function(object) {
+        idx = source.indexOf(object);
+        if (start.contains(idx)) {
+          objects.remove(object);
+          newlen--;
+        }
+      }, this);
+    }
+    
+    // remove indexes from source index set
     set.remove(start, length);
     setlen = set.get('length');
     newlen += setlen;
 
+    // update caches; change enumerable...
     this._indexSetCache = null;
     if (newlen !== oldlen) {
       this.propertyDidChange('length');

data/frameworks/sproutcore/frameworks/runtime/tests/core/IsEqual.js

@@ -3,6 +3,8 @@
 // ========================================================================
 /*globals module test */
 
+var StringA, StringB, StringC;
+
 module("String's - isEqual", {
 	
 	setup: function(){
@@ -18,6 +20,8 @@ test("strings should be equal ",function(){
 	equals(SC.isEqual(StringA,StringC),true);
 });
 
+var num1, num2, num3;
+
 module("Number's - isEqual",{
  
      setup: function(){
@@ -33,7 +37,7 @@ test("numericals should be equal ",function(){
 	equals(SC.isEqual(num1,num3),false);
 }); 
 
-var objectA,objectB; //global variables
+var objectA,objectB, objectC; //global variables
 
 module("Array's - isEqual",{
 	

data/frameworks/sproutcore/frameworks/runtime/tests/core/beget.js

@@ -3,7 +3,7 @@
 // ========================================================================
 /*globals module test ok isObj equals expects */
 
-var objectA, objectB ; // global variables
+var objectA, objectB , arrayA, stringA; // global variables
 
 module("Beget function Module", {
 setup: function() {

data/frameworks/sproutcore/frameworks/runtime/tests/core/compare.js

@@ -23,7 +23,7 @@ module("SC.compare()", {
     v[10] = [1,3];
     v[11] = {a: 'hash'};
     v[12] = SC.Object.create();
-    v[13] = function (a) {return a};
+    v[13] = function (a) {return a;};
   }
 });
 
@@ -37,8 +37,8 @@ test("ordering should work", function() {
     equals(SC.compare(v[j],v[j]), 0, j +' should equal itself');
     for (var i=j+1; i < v.length; i++) {
       equals(SC.compare(v[j],v[i]), -1, 'v[' + j + '] (' + SC.typeOf(v[j]) + ') should be smaller than v[' + i + '] (' + SC.typeOf(v[i]) + ')' );
-    };
+    }
     
-  };
+  }
 }); 
   

data/frameworks/sproutcore/frameworks/runtime/tests/core/guidFor.js

@@ -114,6 +114,8 @@ test("guid should not parse to a number", function() {
   equals(YES, isNaN(parseInt(SC.guidFor(undefined), 0))) ;
 });
 
+var array1, array1copy, array2, array2copy;
+
 module("Arrays", {
 	
 	setup: function() {

data/frameworks/sproutcore/frameworks/runtime/tests/core/isArray.js

@@ -3,7 +3,7 @@
 // ========================================================================
 /*globals module test */
 
-var objectA,objectB,objectC; //global variables
+var objectA,objectB,objectC, objectD, objectE; //global variables
 
 module("Array Check" , {
 	

data/frameworks/sproutcore/frameworks/runtime/tests/core/itemType.js

@@ -1,3 +1,4 @@
+var object;
 module("item type", {
   setup: function() {
      object = SC.Object.create({
@@ -12,7 +13,7 @@ module("item type", {
 });
 
 test("should return the type for the passed item", function() {
-	  a = null;
+	  var a = null;
 	  var arr = [1,2,3];
 	  var obj = {};
 	  

data/frameworks/sproutcore/frameworks/runtime/tests/core/tupleForPropertyPath.js

@@ -3,7 +3,7 @@
 // ========================================================================
 /*globals module test */
 
-var object1,object3; //global variables
+var object, object1,object3; //global variables
 
 module("Checking the tuple for property path",{
 	
@@ -33,5 +33,5 @@ test("should check for the tuple property", function() {
 test("should check for the tuple property when path is undefined",function(){     //test case where no property defined
      var object2;
      object2 = SC.tupleForPropertyPath(object.value,'');
-     equals(YES,object2 == null,'returns null for undefined path');	
+     equals(YES,object2 === null,'returns null for undefined path');	
 });

data/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/propertyChanges.js

@@ -3,7 +3,7 @@
 // ========================================================================
 /*globals module test ok isObj equals expects */
 
-var revMatches = NO ;
+var revMatches = NO , ObjectA;
 
 module("object.propertyChanges", {  
   setup: function() {

data/frameworks/sproutcore/frameworks/runtime/tests/mixins/propertyChanges.js

@@ -1,3 +1,4 @@
+var ObjectA;
 module("object.propertyChanges()", {	
 	setup: function() {
 		ObjectA = SC.Object.create({

data/frameworks/sproutcore/frameworks/runtime/tests/system/binding.js

@@ -3,7 +3,7 @@
 // ========================================================================
 /*globals module test ok isObj equals expects */
 
-var fromObject, toObject, binding ; // global variables
+var fromObject, toObject, binding, Bon1, bon2 ; // global variables
 
 module("basic object binding", {
   
@@ -190,12 +190,12 @@ module("Custom Binding", {
 });
 
 test("Binding value1 such that it will recieve only single values", function() {
-	bon1 = Bon1.create({
+	var bon1 = Bon1.create({
 		value1Binding: SC.Binding.single("TestNamespace.bon2.val1"),
 		array1Binding: SC.Binding.single("TestNamespace.bon2.arr")
 	});
 	SC.Binding.flushPendingChanges();
-	var a = new Array (23,31,12,21);
+	var a = [23,31,12,21];
 	bon2.set("arr", a);
 	bon2.set("val1","changed");
 	SC.Binding.flushPendingChanges();
@@ -205,7 +205,7 @@ test("Binding value1 such that it will recieve only single values", function() {
 });
 
 test("Single binding using notEmpty function.", function() {
-	bond = Bon1.create ({
+	var bond = Bon1.create ({
 	  array1Binding: SC.Binding.single("TestNamespace.bon2.arr").notEmpty(null,'(EMPTY)')
 	});
 	SC.Binding.flushPendingChanges();
@@ -215,7 +215,7 @@ test("Single binding using notEmpty function.", function() {
 });
 
 test("Binding with transforms, function to check the type of value", function() {
-	jon = Bon1.create({
+	var jon = Bon1.create({
 		value1Binding: SC.Binding.transform(function(val1) {
 			return (SC.typeOf(val1) == SC.T_STRING)? val1 : "";
 		}).from("TestNamespace.bon2.val1")
@@ -232,11 +232,13 @@ test("two bindings to the same value should sync in the order they are initializ
 
   SC.RunLoop.begin();
 
-  var a = window.a = SC.Object.create({ 
+  window.a = SC.Object.create({ 
     foo: "bar" 
   });
   
-  var b = window.b = SC.Object.create({ 
+  var a = window.a;
+  
+  window.b = SC.Object.create({ 
     foo: "baz",
     fooBinding: "a.foo",
     
@@ -251,6 +253,8 @@ test("two bindings to the same value should sync in the order they are initializ
     }
     
   });
+  
+  var b = window.b;
 
   SC.LOG_BINDINGS = YES;