sproutit-sproutcore 1.0.0.20090416161445 → 1.0.0.20090720093355

data/frameworks/sproutcore/frameworks/foundation/system/event.js

@@ -77,8 +77,8 @@ SC.Event = function(originalEvent) {
   
   // normalize wheelDelta, wheelDeltaX, & wheelDeltaY for Safari
   if (SC.browser.safari && originalEvent.wheelDelta!==undefined) {
-    this.wheelDelta = this.wheelDeltaY = 0-(originalEvent.wheelDeltaY || originalEvent.wheelDelta)/120;
-    this.wheelDeltaX = 0-(originalEvent.wheelDeltaX||0)/120 ;
+    this.wheelDelta = this.wheelDeltaY = 0-(originalEvent.wheelDeltaY || originalEvent.wheelDelta);
+    this.wheelDeltaX = 0-(originalEvent.wheelDeltaX||0) ;
     
   // normalize wheelDelta for Firefox
   // note that we multiple the delta on FF to make it's acceleration more 
@@ -328,6 +328,32 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
 
   NO_BUBBLE: ['blur', 'focus', 'change'],
   
+  /**
+    Generates a simulated event object.  This is mostly useful for unit 
+    testing.  You can pass the return value of this property into the 
+    trigger() method to actually send the event.
+    
+    @param {Element} elem the element the event targets
+    @param {String} eventType event type.  mousedown, mouseup, etc
+    @param {Hash} attrs optional additonal attributes to apply to event.
+    @returns {Hash} simulated event object
+  */
+  simulateEvent: function(elem, eventType, attrs) {
+    var ret = SC.Event.create({
+      type: eventType,
+      target: elem,
+      preventDefault: function(){ this.cancelled = YES; },
+      stopPropagation: function(){ this.bubbles = NO; },
+      allowDefault: function() { this.hasCustomEventHandling = YES; },
+      timeStamp: Date.now(),
+      bubbles: (this.NO_BUBBLE.indexOf(eventType)<0),
+      cancelled: NO,
+      normalized: YES
+    });
+    if (attrs) SC.mixin(ret, attrs) ;
+    return ret ;
+  },
+  
   /**
     Trigger an event execution immediately.  You can use this method to 
     simulate arbitrary events on arbitary elements.
@@ -338,9 +364,15 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     much simpler.  Notably namespaced events are not supported and you cannot
     trigger events globally.
     
-    If you need more advanced event handling, consider the SC.ClassicResponder 
+    If you need more advanced event handling, consider the SC.Responder 
     functionality provided by SproutCore or use your favorite DOM library.
 
+    h2. Example
+    
+    {{{
+      SC.Event.trigger(view.get('layer'), 'mousedown');
+    }}}
+    
     @param elem {Element} the target element
     @param eventType {String} the event type
     @param args {Array} optional argument or arguments to pass to handler.
@@ -372,28 +404,18 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
     // Get the event to pass, creating a fake one if necessary
     var event = args[0];
     if (!event || !event.preventDefault) {
-      event = {
-        type: eventType,
-        target: elem,
-        preventDefault: function(){ this.cancelled = YES; },
-        stopPropagation: function(){ this.bubble = NO; },
-        allowDefault: function() { this.hasCustomEventHandling = YES; },
-        timeStamp: Date.now(),
-        bubble: (this.NO_BUBBLE.indexOf(eventType)<0) ,
-        cancelled: NO,
-        normalized: YES
-      } ;
+      event = this.simulateEvent(elem, eventType) ;
       args.unshift(event) ;
     }
-
+    
     event.type = eventType ;
-
+    
     // Trigger the event - bubble if enabled
     var current = elem;
     do {
       ret = SC.Event.handle.apply(current, args);
       current = (current===document) ? null : (current.parentNode || document);
-    } while(!ret && event.bubble && current);    
+    } while(!ret && event.bubbles && current);    
     current = null ;
 
     // Handle triggering native .onfoo handlers
@@ -619,8 +641,14 @@ SC.mixin(SC.Event, /** @scope SC.Event */ {
       if (elem.addEventListener) {
         elem.addEventListener(eventType, listener, NO);
       } else if (elem.attachEvent) {
+        // attachEvent is not working for IE8 and xhr objects
+        // there is currently a hack in request , but it needs to fixed here.
         elem.attachEvent("on" + eventType, listener);
       }
+      //  
+      // else {
+      //         elem.onreadystatechange = listener;
+      //       }
     }
     
     elem = special = listener = null ; // avoid memory leak
@@ -753,10 +781,13 @@ SC.Event.prototype = {
     // handle function keys.
     if (code) {
       ret = SC.FUNCTION_KEYS[code] ;
-      if (!ret && (this.altKey || this.ctrlKey)) ret =SC.PRINTABLE_KEYS[code];
+      if (!ret && (this.altKey || this.ctrlKey || this.metaKey)) {
+        ret = SC.PRINTABLE_KEYS[code];
+      }
+      
       if (ret) {
         if (this.altKey) modifiers += 'alt_' ;
-        if (this.ctrlKey) modifiers += 'ctrl_' ;
+        if (this.ctrlKey || this.metaKey) modifiers += 'ctrl_' ;
         if (this.shiftKey) modifiers += 'shift_' ;
       }
     }
@@ -766,9 +797,14 @@ SC.Event.prototype = {
       code = this.which ;
       key = ret = String.fromCharCode(code) ;
       lowercase = ret.toLowerCase() ;
-      if (ret != lowercase) {
+      if (this.metaKey) {
+        modifiers = 'meta_' ;
+        ret = lowercase;
+        
+      } else if (ret !== lowercase) {
         modifiers = 'shift_' ;
         ret = lowercase ;
+
       } else ret = null ;
     }
 
@@ -792,7 +828,7 @@ SC.Event.fire = SC.Event.trigger;
 // Register unload handler to eliminate any registered handlers
 // This avoids leaks in IE and issues with mouseout or other handlers on 
 // other browsers.
-SC.Event.add(window, 'unload', SC.Event, SC.Event.unload) ;
+SC.Event.add(window, 'unload', SC.Event.prototype, SC.Event.unload) ;
 
 SC.MODIFIER_KEYS = {
   16:'shift', 17:'ctrl', 18: 'alt'

data/frameworks/sproutcore/frameworks/foundation/system/ready.js

@@ -55,8 +55,9 @@ SC.mixin({
       }, NO);
     }
 
-    if ( SC.browser.safari ) {
-      console.log("ready() is not yet supported on Safari <= 3.1") ;
+    if (SC.browser.safari && SC.browser.safari < 530.0 ) {
+      console.error("ready() is not yet supported on Safari 3.1 and earlier");
+      // TODO: implement ready() in < Safari 4 
       // var numStyles;
       // (function(){
       //   if (SC.isReady) return;
@@ -90,7 +91,8 @@ SC.mixin({
   _didBecomeReady: function() {
     // Only call once
     if (SC.isReady) return ;
-    
+    if (typeof SC.mapDisplayNames === SC.T_FUNCTION) SC.mapDisplayNames();
+     
     // setup locale
     SC.Locale.createCurrentLocale();
     
@@ -136,10 +138,10 @@ SC.mixin({
     if (SC.removeLoading) SC.$('#loading').remove();
     
     // Now execute main, if defined
-    if ((typeof main != "undefined") && (main instanceof Function) && !SC.suppressMain) main();
+    if ((SC.mode === SC.APP_MODE) && (typeof main != "undefined") && (main instanceof Function) && !SC.suppressMain) main();
     
     // handle routes, if modules is installed.
-    if (SC.Routes && SC.Routes.ping) SC.Routes.ping() ; 
+    if (SC.routes && SC.routes.ping) SC.routes.ping() ; 
     
     // end run loop.  This is probably where a lot of bindings will trigger
     SC.RunLoop.end() ; 
@@ -187,3 +189,7 @@ SC.mixin({
 SC._bindReady() ;
 SC.removeLoading = YES;
 
+// default to app mode.  When loading unit tests, this will run in test mode
+SC.APP_MODE = "APP_MODE";
+SC.TEST_MODE = "TEST_MODE";
+SC.mode = SC.APP_MODE;

data/frameworks/sproutcore/frameworks/foundation/system/render_context.js

@@ -7,6 +7,15 @@
 
 sc_require('system/builder');
 
+/** set update mode on context to replace content (preferred) */
+SC.MODE_REPLACE = 'replace';
+
+/** set update mode on context to append content */
+SC.MODE_APPEND = 'append';
+
+/** set update mode on context to prepend content */
+SC.MODE_PREPEND = 'prepend';
+
 /**
   @namespace
   
@@ -75,6 +84,7 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
       this.strings.push(null);
       if (this._tagName === 'script') this._selfClosing = NO; // special case
       if (this._tagName === 'div') this._selfClosing = NO; //  illegal in html 4.01
+      if (this._tagName === 'select') this._selfClosing = NO; //  illegal in html 4.01
     } else {
       this._elem = tagNameOrElement ;
       this._needsTag = NO ;
@@ -115,9 +125,17 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
   length: 0,
   
   /**
-    YES if the update is partial; existing DOM nodes should be retained.
+    Specify the method that should be used to update content on the element.
+    In almost all cases you want to replace the content.  Very carefully 
+    managed code (such as in CollectionView) can append or prepend content
+    instead.
+    
+    You probably do not want to change this propery unless you know what you
+    are doing.
+    
+    @property {String}
   */
-  partialUpdate: NO,
+  updateMode: SC.MODE_REPLACE,
 
   /**
     YES if the context needs its content filled in, not just its outer 
@@ -267,7 +285,9 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
     @returns {SC.RenderContext} previous context or null if top 
   */
   update: function() {
-    var elem = this._elem, key, value, styles, elem2, n, n2;  
+    var elem = this._elem, 
+        mode = this.updateMode,
+        key, value, styles, factory, cur, next, before;
     
     if (!elem) {
       // throw "Cannot update context because there is no source element";
@@ -280,19 +300,19 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
     
     // replace innerHTML
     if (this.length>0) {
-      if (this.partialUpdate) {
-        elem2 = elem.cloneNode(false);
-        elem2.innerHTML = this.join();
-        n = elem2.firstChild ;
-        n2 = n.nextSibling ;
-        while (n) {
-          elem.appendChild(n) ;
-          n = n2 ;
-          n2 = n ? n.nextSibling : null ;
-        }
-        elem2 = null ;
-      } else {
+      if (mode === SC.MODE_REPLACE) {
         elem.innerHTML = this.join();
+      } else {
+        factory = elem.cloneNode(false);
+        factory.innerHTML = this.join() ;
+        before = (mode === SC.MODE_APPEND) ? null : elem.firstChild;
+        cur = factory.firstChild ;
+        while(cur) {
+          next = cur.nextSibling ;
+          elem.insertBefore(cur, next);
+          cur = next ;
+        }
+        cur = next = factory = before = null ; // cleanup 
       }
     }
     
@@ -601,6 +621,17 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
     return this;
   },
   
+  /**
+    Removes all classnames from the currentContext.  
+    
+    @returns {SC.RenderContext} receiver
+  */
+  resetClassNames: function() {
+    this._classNames = [];
+    this._classNamesDidChange = YES ;
+    return this;
+  },
+  
   /**
     You can either pass a single class name and a boolean indicating whether
     the value should be added or removed, or you can pass a hash with all
@@ -673,7 +704,6 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
   */
   styles: function(styles, cloneOnModify) {
     var attr, regex, match;
-    
     if (styles === undefined) {
       
       // no styles are defined yet but we do have a source element.  Lazily
@@ -681,11 +711,20 @@ SC.RenderContext = SC.Builder.create(/** SC.RenderContext.fn */ {
       if (!this._styles && this._elem) {
         // parse style...
         attr = this._elem.getAttribute('style');
+        
+        ////// TODO :LOOK OUT I ADDED TOLOWERCASE BECAUSE IE IS ALWAYS RETURNING STYLE KEYS IN CAPS
+        ////// THAT MESSES UP CAMELIZING AND WE END UP WITH stuff like c-olor in the styles
+        ////// I have to add more unit test 
+        ////// JUAN
+        
+        if(SC.browser.msie) attr = attr.toLowerCase();
+        
         if (attr && (attr = attr.toString()).length>0) {
           styles = {};
           
           regex = this._STYLE_REGEX ;
           regex.lastIndex = 0;
+          
           while(match = regex.exec(attr)) styles[match[1].camelize()] = match[2];
           
           this._styles = styles;

data/frameworks/sproutcore/frameworks/foundation/system/request.js

@@ -6,6 +6,12 @@
 // ==========================================================================
 /*global ActiveXObject */
 
+/**
+  Description to come.
+  
+  @since SproutCore 1.0
+*/
+
 SC.Request = SC.Object.extend({
   
   isAsynchronous: true,
@@ -14,12 +20,21 @@ SC.Request = SC.Object.extend({
   transportClass: null,
   isJSON: false,
   
+  /**
+    Sets up the request object
+  */
   init: function(){
-    sc_super() ;
-    
+    sc_super() ;  
     this._headers = {};
   },
   
+  /**
+    To set headers on the request object
+    
+    @param {String} key
+    @param {String} value
+    @returns {SC.Request} receiver
+  */
   header: function(key, value) {
     if (typeof key == 'object' && !value) {
       for (var headerKey in key) {
@@ -41,29 +56,61 @@ SC.Request = SC.Object.extend({
     return this ;
   },
   
-  send: function() {
-    var request = this ; // SC.clone(this) ;
+  /**
+    Will fire the actual request.
+    
+    @param {String} body (optional)
+    @returns {SC.Request} receiver
+  */  
+  send: function(body) {
+    var request = this ; 
+    if(body) {
+      if(this.get('isJSON')) {
+        body=SC.json.encode(body);
+        if(body===undefined) console.error('There was an error encoding to JSON');
+      }
+      request.set('body', body) ;
+    }
     SC.Request.manager.sendRequest(request) ;
     return request ;
   },
-  
-  notify: function(target, action) {
+
+  /**
+    Set up notifications.
+    
+    @param {Object} target
+    @param {String|function} action
+    @param {Hash} params
+    @returns {SC.Request} receiver
+  */
+  notify: function(target, action, params) {
     if (SC.typeOf(action) === SC.T_STRING) action = target[action];
-    this.set('notifyTarget', target).set('notifyAction', action);
+    this.set('notifyTarget', target)
+    .set('notifyAction', action)
+    .set('notifyParams', params);
     return this;
   },
   
+  /**
+    Response method
+    
+    @returns {Object} response
+  */
   response: function() {
     var response = this.get("rawResponse") ;
-    if (!response || !SC.$ok(response)) {
+    if (!response || !SC.$ok(response) || response.responseText.trim()==='') {
         return response ;
     }
     
     if (this.get("isJSON")) {
-        var source = response.responseText ;
+      var source = response.responseText ;
+      try{
         var json = SC.json.decode(source) ;
-        //TODO cache this value?
-        return json ;
+      }catch(e){
+        json = response.responseText ;
+      }
+      //TODO cache this value?
+      return json ;
     }
     
     if(response.responseXML) return response.responseXML ;
@@ -72,6 +119,12 @@ SC.Request = SC.Object.extend({
   
 });
 
+/**
+  Helper method for quickly setting up a GET request.
+  
+  @param {String} address url of request
+  @returns {SC.Request} receiver
+*/
 SC.Request.getUrl = function(address) {
   var req = SC.Request.create() ;
   req.set('address', address) ;
@@ -80,14 +133,56 @@ SC.Request.getUrl = function(address) {
   return req ;
 };
 
-SC.Request.postUrl = function(address) {
+/**
+  Helper method for quickly setting up a POST request.
+  
+  @param {String} address url of request
+  @param {String} body
+  @returns {SC.Request} receiver
+*/
+SC.Request.postUrl = function(address, body) {
   var req = SC.Request.create() ;
   req.set('address',address) ;
+  if(body) req.set('body', body) ;
   req.set('type', 'POST') ;
   
   return req ;
 };
 
+/**
+  Helper method for quickly setting up a DELETE request.
+  
+  @param {String} address url of request
+  @returns {SC.Request} receiver
+*/
+SC.Request.deleteUrl = function(address) {
+  var req = SC.Request.create() ;
+  req.set('address',address) ;
+  req.set('type', 'DELETE') ;
+  
+  return req ;
+};
+
+/**
+  Helper method for quickly setting up a PUT request.
+  
+  @param {String} address url of request
+  @param {String} body
+  @returns {SC.Request} receiver
+*/
+SC.Request.putUrl = function(address, body) {
+  var req = SC.Request.create() ;
+  req.set('address',address) ;
+  if(body) req.set('body', body) ;
+  req.set('type', 'PUT') ;
+  
+  return req ;
+};
+
+/**
+  The request manager.
+  More description to come.
+*/
 SC.Request.manager = SC.Object.create( SC.DelegateSupport, {
   maxRequests: 2,
   
@@ -96,7 +191,7 @@ SC.Request.manager = SC.Object.create( SC.DelegateSupport, {
   
   canLoadAnotherRequest: function() {
     return (this.get('numberOfCurrentRequests') < this.get('maxRequests')) ;
-  }.property('numberOfCurrentRequests'),
+  }.property('numberOfCurrentRequests', 'maxRequests'),
   
   numberOfCurrentRequests: function() {
     return this.get('currentRequests').length ;
@@ -112,7 +207,8 @@ SC.Request.manager = SC.Object.create( SC.DelegateSupport, {
     request = { 
       request: request, 
       action:  request.get('notifyAction'),
-      target:  request.get('notifyTarget') };
+      target:  request.get('notifyTarget'),
+      params:  request.get('notifyParams') };
     
     this.propertyWillChange("queue");
     this.get('queue').pushObject(request);
@@ -121,6 +217,22 @@ SC.Request.manager = SC.Object.create( SC.DelegateSupport, {
     this.fireRequestIfNeeded();
   },
   
+  removeRequest: function(request) {
+    this.get('queue').removeObject(request);
+    return YES;
+  },  
+  
+  cancelAllRequests: function() {
+    var r, xhrRequest;
+    this.set('queue', []);
+    var activeRequests=this.get('currentRequests');
+    while(r=activeRequests.popObject()){
+      xhrRequest = r.get('request');
+      xhrRequest.abort();
+    }
+    return YES;
+  },
+  
   fireRequestIfNeeded: function() {
     if (this.canLoadAnotherRequest()) {
       this.propertyWillChange('queue') ;
@@ -189,17 +301,33 @@ SC.XHRRequestTransport = SC.RequestTransport.extend({
     
     var request = this.get('request') ;
     
-    var headers = request.get('headers') ;
-    for (var headerKey in headers) {
-      rawRequest.setRequestHeader(headerKey, headers[headerKey]) ;
-    }
-    
     rawRequest.source = request;
     
+    
+    //Part of the fix for IE
+    var transport=this;
+    var handleReadyStateChange = function() {
+      return transport.finishRequest(rawRequest) ;
+    };
+    //End of the fix for IE
+    
     var async = (request.get('isAsynchronous') ? YES : NO) ;
-    if (async) SC.Event.add(rawRequest, 'readystatechange', this, this.handleReadyStateChange, rawRequest) ;
+    if (async) {
+      if (!SC.browser.msie) {
+        SC.Event.add(rawRequest, 'readystatechange', this, handleReadyStateChange, rawRequest) ;
+      } else rawRequest.onreadystatechange = handleReadyStateChange;
+    }
+    
+    
     
     rawRequest.open( request.get('type'), request.get('address'), async ) ;
+    
+    // headers need to be set *After* the open call.
+    var headers = request._headers ;
+    for (var headerKey in headers) {
+      rawRequest.setRequestHeader(headerKey, headers[headerKey]) ;
+    }
+    
     rawRequest.send(request.get('body')) ;
     
     if (!async) this.finishRequest(rawRequest) ;
@@ -216,6 +344,7 @@ SC.XHRRequestTransport = SC.RequestTransport.extend({
   },
   
   finishRequest: function(request) {
+    
     var readyState = request.readyState ;
     var didSucceed = !request ? NO : this.didSucceed(request) ;
     
@@ -224,16 +353,15 @@ SC.XHRRequestTransport = SC.RequestTransport.extend({
       
       if (didSucceed) {
         var response = request ;
-        request.source.set('rawResponse', response) ;
+        request.source.set('rawResponse', response) ; 
       } else {
         var error = SC.$error("HTTP Request failed", "Fail", -1) ;
         error.set("request",request) ;
         request.source.set('rawResponse', error) ;
       }
-      
       if (this.target && this.action) {
         SC.RunLoop.begin();
-        this.action.call(this.target, request.source);
+        this.action.call(this.target, request.source, this.params);
         SC.RunLoop.end();
       }
       
@@ -244,11 +372,8 @@ SC.XHRRequestTransport = SC.RequestTransport.extend({
        // avoid memory leak in MSIE: clean up
        request.onreadystatechange = function() {} ;
      }
-  },
-  
-  handleReadyStateChange: function(readyStateEvent) {
-    return this.finishRequest(readyStateEvent.context) ;
   }
+
   
 });