sproutcore 1.4.5-java → 1.5.0-java

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/source_list.js

@@ -0,0 +1,8 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+SC.BaseTheme.SourceList = SC.BaseTheme.subtheme('source-list');

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/toolbar.js

@@ -0,0 +1,18 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+SC.BaseTheme.toolbarRenderDelegate = SC.RenderDelegate.create({
+  name: 'toolbar',
+
+  render: function(dataSource, context) {
+    // toolbar has nothing in it
+  },
+  
+  update: function() {
+    // toolbar has nothing to update
+  }
+});

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/well.js

@@ -0,0 +1,17 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+SC.BaseTheme.wellRenderDelegate = SC.RenderDelegate.create({
+  name: 'well',
+  render: function(dataSource, context) {
+    this.includeSlices(dataSource, context, SC.NINE_SLICE);
+  },
+  
+  update: function() {
+
+  }
+});

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/workspace.js

@@ -0,0 +1,18 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+SC.BaseTheme.workspaceRenderDelegate = SC.RenderDelegate.create({
+  name: 'workspace',
+  
+  render: function() {
+    // No DOM to generate -- uses CSS3 to style.
+  },
+
+  update: function() {
+    // No DOM to generate -- uses CSS3 to style.
+  }
+});

data/lib/frameworks/sproutcore/frameworks/desktop/system/drag.js

@@ -1,60 +1,119 @@
-// ========================================================================
-// SproutCore -- JavaScript Application Framework
-// Copyright ©2006-2011, Strobe Inc. and contributors.
-// Portions copyright ©2008 Apple Inc.  All rights reserved.
-// ========================================================================
-
-SC.DRAG_LINK = 0x0004; SC.DRAG_COPY = 0x0001; SC.DRAG_MOVE = 0x0002;
-SC.DRAG_NONE = 0x0000; SC.DRAG_ANY = 0x0007; // includes SC.DRAG_REORDER
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+
+/**
+  @static
+*/
+SC.DRAG_LINK = 0x0004;
+
+/**
+  @static
+*/
+SC.DRAG_COPY = 0x0001;
+
+/**
+  @static
+*/
+SC.DRAG_MOVE = 0x0002;
+
+/**
+  @static
+*/
+SC.DRAG_NONE = 0x0000;
+
+/**
+  @static
+*/
+SC.DRAG_ANY = 0x000F;
+
+/**
+  @static
+*/
+SC.DRAG_DATA = 0x0008; // includes SC.DRAG_REORDER
+
+/**
+  @static
+*/
 SC.DRAG_AUTOSCROLL_ZONE_THICKNESS = 20;
 
+SC.View.reopen(
+  /** @scope SC.View.prototype */ {
+
+  /** @private */
+  init: function(original) {
+    original();
+
+    // register for drags
+    if (this.get('isDropTarget')) { SC.Drag.addDropTarget(this) ; }
+
+    // register scroll views for autoscroll during drags
+    if (this.get('isScrollable')) { SC.Drag.addScrollableView(this) ; }
+  }.enhance(),
+
+  /** @private */
+  destroy: function(original) {
+    // unregister for drags
+    if (this.get('isDropTarget')) { SC.Drag.removeDropTarget(this) ; }
+
+    // unregister for autoscroll during drags
+    if (this.get('isScrollable')) { SC.Drag.removeScrollableView(this) ; }
+
+    return original();
+  }.enhance()
+});
+
 /**
   @class
   
   An instance of this object is created whenever a drag occurs.  The instance
-  manages the mouse events and coordinating with droppable targets until the
+  manages the mouse/touch events and coordinating with droppable targets until the
   user releases the mouse button. 
   
   To initiate a drag, you should call SC.Drag.start() with the options below
-  specified in a hash. Pass the ones you need to get the drag you want:  
+  specified in a hash. Pass the ones you need to get the drag you want:
   
-  - *event: (req)* The mouse event that triggered the drag.  This will be used
-    to position the element.
+    - *event: (req)* The mouse event/touch that triggered the drag.  This will be used
+      to position the element.
   
-  - *source: (req)* The drag source object that should be consulted during 
-    the drag operations. This is usually the container view that initiated 
-    the drag.
+    - *source: (req)* The drag source object that should be consulted during 
+      the drag operations. This is usually the container view that initiated 
+      the drag.
   
-  - *dragView: *  Optional view that will be used as the source image for the
-    drag. The drag operation will clone the DOM elements for this view and
-    parent them under the drag pane, which has the class name 'sc-ghost-view'.
-    The drag view is not moved from its original location during a drag.
-    If the dragView is not provided, the source is used as dragView.
+    - *dragView:*  Optional view that will be used as the source image for the
+      drag. The drag operation will clone the DOM elements for this view and
+      parent them under the drag pane, which has the class name 'sc-ghost-view'.
+      The drag view is not moved from its original location during a drag.
+      If the dragView is not provided, the source is used as dragView.
   
-  - *ghost:  YES | NO*  If NO, the drag view image will show, but the source 
-    dragView will not be hidden.  Set to YES to make it appear that the 
-    dragView itself is being dragged around.
+    - *ghost:  YES | NO*  If NO, the drag view image will show, but the source 
+      dragView will not be hidden.  Set to YES to make it appear that the 
+      dragView itself is being dragged around.
   
-  - *slideBack: YES | NO*  If YES and the drag operation is cancelled, the 
-    dragView will slide back to its source origin.
+    - *slideBack: YES | NO*  If YES and the drag operation is cancelled, the 
+      dragView will slide back to its source origin.
   
-  - *origin:*  If passed, this will be used as the origin point for the 
-    ghostView when it slides back.  You normally do not need to pass this 
-    unless the ghost view does not appear in the main UI.
+    - *origin:*  If passed, this will be used as the origin point for the 
+      ghostView when it slides back.  You normally do not need to pass this 
+      unless the ghost view does not appear in the main UI.
   
-  - *data:* Optional hash of data types and values.  You can use this to pass 
-    a static set of data instead of providing a dataSource.  If you provide
-    a dataSource, it will be used instead.
+    - *data:* Optional hash of data types and values.  You can use this to pass 
+      a static set of data instead of providing a dataSource.  If you provide
+      a dataSource, it will be used instead.
   
-  - *dataSource:*  Optional object that will provide the data for the drag to 
-    be consumed by the drop target.  If you do not pass this parameter or the 
-    data hash, then the source object will be used if it implements the 
-    SC.DragDataSource protocol.
+    - *dataSource:*  Optional object that will provide the data for the drag to 
+      be consumed by the drop target.  If you do not pass this parameter or the 
+      data hash, then the source object will be used if it implements the 
+      SC.DragDataSource protocol.
   
-  - *anchorView:* if you pass this optional view, then the drag will only be 
-    allowed to happen within this view.  The ghostView will actually be added 
-    as a child of this view during the drag.  Normally the anchorView is the 
-    window.
+    - *anchorView:* if you pass this optional view, then the drag will only be 
+      allowed to happen within this view.  The ghostView will actually be added 
+      as a child of this view during the drag.  Normally the anchorView is the 
+      window.
   
   @extends SC.Object
 */
@@ -80,7 +139,7 @@ SC.Drag = SC.Object.extend(
   
   /**
     If YES, then the ghostView will acts like a cursor and attach directly
-    to the mouse location.
+    to the mouse/touch location.
     
     @readOnly
     @type Boolean
@@ -88,7 +147,7 @@ SC.Drag = SC.Object.extend(
   ghostActsLikeCursor: NO,
   
   /**  
-    The view that was used as the source of the ghostView.  
+    The view that was used as the source of the ghostView.
     
     The drag view is not moved from its original location during a drag.
     Instead, the DOM content of the view is cloned and managed by the 
@@ -109,6 +168,14 @@ SC.Drag = SC.Object.extend(
     @type Boolean
   */
   ghost: YES,
+
+  /**
+    If NO, the source will not be copied, clone, no ghost view will get created,
+    and it won't be moved.
+
+    @type Boolean
+  */
+	sourceIsDraggable: YES,
   
   /**
     If YES, then the ghostView will slide back to its original location if 
@@ -117,15 +184,7 @@ SC.Drag = SC.Object.extend(
     @type Boolean
   */
   slideBack: YES,
-  
-  /**
-    The original mouse down event.
-    
-    @readOnly
-    @type SC.Event
-  */
-  mouseDownEvent: null,
-  
+
   /**
     The origin to slide back to in the coordinate of the dragView's 
     containerView.
@@ -136,7 +195,7 @@ SC.Drag = SC.Object.extend(
   
   /**
     The current location of the mouse pointer in window coordinates. This is 
-    updated as long as the mouse button is pressed. Drop targets are 
+    updated as long as the mouse button is pressed or touch is active. Drop targets are 
     encouraged to update this property in their dragUpdated() method 
     implementations.
     
@@ -163,7 +222,7 @@ SC.Drag = SC.Object.extend(
     on your dragEntered() and prepareForDragOperation() methods to determine 
     if you can handle any of the data types offered up by the drag source.
     
-    @property {Array} available data types
+    @type Array
   */
   dataTypes: function() {
     // first try to use the data source.
@@ -190,7 +249,7 @@ SC.Drag = SC.Object.extend(
   /**
     Checks for a named data type in the drag.
     
-    @param dataType {String} the data type
+    @param {String} dataType the data type
     @returns {Boolean} YES if data type is present in dataTypes array.
   */
   hasDataType: function(dataType) {
@@ -285,42 +344,60 @@ SC.Drag = SC.Object.extend(
     This will actually start the drag process. Called by SC.Drag.start().
   */
   startDrag: function() {
-    // create the ghost view
-    this._createGhostView() ;
+		if (this.get('sourceIsDraggable')) {
+	    // create the ghost view
+	    this._createGhostView() ;
+		}
     
     var evt = this.event ;
     
-    // compute the ghost offset from the original mouse location
+    // compute the ghost offset from the original start location
     
     var loc = { x: evt.pageX, y: evt.pageY } ;
     this.set('location', loc) ;
     
-    var dv = this._getDragView() ;
-    var pv = dv.get('parentView') ;
+		if (this.get('sourceIsDraggable')) {
+	    var dv = this._getDragView() ;
+	    var pv = dv.get('parentView') ;
 
-    // convert to global cooridinates
-    var origin = pv ? pv.convertFrameToView(dv.get('frame'), null) : dv.get('frame') ;
+	    // convert to global cooridinates
+	    var origin = pv ? pv.convertFrameToView(dv.get('frame'), null) : dv.get('frame') ;
 
-    if (this.get('ghost')) {
-      // Hide the dragView
-      this._dragViewWasVisible = dv.get('isVisible') ;
-      dv.set('isVisible', NO) ;
-    }
+	    if (this.get('ghost')) {
+	      // Hide the dragView
+	      this._dragViewWasVisible = dv.get('isVisible') ;
+	      dv.set('isVisible', NO) ;
+	    }
 
-    if (this.ghostActsLikeCursor) this.ghostOffset = { x: 14, y: 14 };
-    else this.ghostOffset = { x: (loc.x-origin.x), y: (loc.y-origin.y) } ;
-    
-    // position the ghost view
-    if(!this._ghostViewHidden) this._positionGhostView(evt) ;
-    
-    // notify root responder that a drag is in process
-    this.ghostView.rootResponder.dragDidStart(this) ;
+	    if (this.ghostActsLikeCursor) this.ghostOffset = { x: 14, y: 14 };
+	    else this.ghostOffset = { x: (loc.x-origin.x), y: (loc.y-origin.y) } ;
+    
+	    // position the ghost view
+	    if(!this._ghostViewHidden) this._positionGhostView(evt) ;
+    
+	    if (evt.makeTouchResponder) {
+	      // Should use invokeLater if I can figure it out
+	      var self = this;
+	      SC.Timer.schedule({ 
+	        target: evt, 
+	        action: function() { 
+	          if (!evt.hasEnded) evt.makeTouchResponder(self, YES);
+	        }, 
+	        interval: 1
+	      });
+	    } 
+	    else {
+	      // notify root responder that a drag is in process
+	      this.ghostView.rootResponder.dragDidStart(this, evt) ;
+	    }
+		}
     
     var source = this.source ;
     if (source && source.dragDidBegin) source.dragDidBegin(this, loc) ;
     
     // let all drop targets know that a drag has started
     var ary = this._dropTargets() ;
+    
     for (var idx=0, len=ary.length; idx<len; idx++) {
       ary[idx].tryToPerform('dragStarted', this, evt) ;
     }
@@ -341,12 +418,14 @@ SC.Drag = SC.Object.extend(
 
     if (target && target.dragExited) target.dragExited(this, this._lastMouseDraggedEvent);
 
-    this._destroyGhostView();
+		if (this.get('sourceIsDraggable')) {
+	    this._destroyGhostView();
 
-    if (this.get('ghost')) {
-      if (this._dragViewWasVisible) this._getDragView().set('isVisible', YES);
-      this._dragViewWasVisible = null;
-    }
+	    if (this.get('ghost')) {
+	      if (this._dragViewWasVisible) this._getDragView().set('isVisible', YES);
+	      this._dragViewWasVisible = null;
+	    }	
+		}
 
     var source = this.source;
     if (source && source.dragDidEnd) source.dragDidEnd(this, loc, SC.DRAG_NONE);
@@ -358,7 +437,12 @@ SC.Drag = SC.Object.extend(
   // ..........................................
   // PRIVATE PROPERTIES AND METHODS
   //
-  
+
+  /** @private */
+  touchStart: function(evt) {
+    return YES;
+  },
+
   /** @private
     This method is called repeatedly during a mouse drag.  It updates the
     position of the ghost image, then it looks for a current drop target and
@@ -421,9 +505,13 @@ SC.Drag = SC.Object.extend(
     if (source && source.dragDidMove) source.dragDidMove(this, loc) ;
     
     // reposition the ghostView
-    if(!this._ghostViewHidden) this._positionGhostView(evt) ;
+    if(this.get('sourceIsDraggable') && !this._ghostViewHidden) this._positionGhostView(evt) ;
   },
-  
+
+  touchesDragged: function(evt){
+    this.mouseDragged(evt);
+  },
+
   /**
     @private
     
@@ -445,14 +533,14 @@ SC.Drag = SC.Object.extend(
         op = SC.DRAG_NONE;
       }
     } catch (e) {
-      console.error('Exception in SC.Drag.mouseUp(acceptDragOperation|performDragOperation): %@'.fmt(e)) ;
+      SC.Logger.error('Exception in SC.Drag.mouseUp(acceptDragOperation|performDragOperation): %@'.fmt(e)) ;
     }
     
     try {
       // notify last drop target that the drag exited, to allow it to cleanup
       if (target && target.dragExited) target.dragExited(this, evt) ;
     } catch (ex) {
-      console.error('Exception in SC.Drag.mouseUp(target.dragExited): %@'.fmt(ex)) ;
+      SC.Logger.error('Exception in SC.Drag.mouseUp(target.dragExited): %@'.fmt(ex)) ;
     }
     
     // notify all drop targets that the drag ended
@@ -461,18 +549,20 @@ SC.Drag = SC.Object.extend(
       try {
         ary[idx].tryToPerform('dragEnded', this, evt) ;
       } catch (ex2) {
-        console.error('Exception in SC.Drag.mouseUp(dragEnded on %@): %@'.fmt(ary[idx], ex2)) ;
+        SC.Logger.error('Exception in SC.Drag.mouseUp(dragEnded on %@): %@'.fmt(ary[idx], ex2)) ;
       }
     }
 
-    // destroy the ghost view
-    this._destroyGhostView() ;
+		if (this.get('sourceIsDraggable')) {
+	    // destroy the ghost view
+	    this._destroyGhostView() ;
 
-    if (this.get('ghost')) {
-      // Show the dragView if it was visible
-      if (this._dragViewWasVisible) this._getDragView().set('isVisible', YES) ;
-      this._dragViewWasVisible = null;
-    }
+	    if (this.get('ghost')) {
+	      // Show the dragView if it was visible
+	      if (this._dragViewWasVisible) this._getDragView().set('isVisible', YES) ;
+	      this._dragViewWasVisible = null;
+	    }	
+		}
 
     // notify the source that everything has completed
     var source = this.source ;
@@ -482,6 +572,11 @@ SC.Drag = SC.Object.extend(
     this._dragInProgress = NO ; // required by autoscroll (invoked by a timer)
   },
 
+  /** @private */
+  touchEnd: function(evt){
+    this.mouseUp(evt);
+  },
+
   /** @private
     Returns the dragView. If it is not set, the source is returned.
   */
@@ -524,7 +619,7 @@ SC.Drag = SC.Object.extend(
   },
   
   /** @private
-    Positions the ghost view underneath the mouse with the initial offset
+    Positions the ghost view underneath the mouse/touch with the initial offset
     recorded by when the drag started.
   */
   _positionGhostView: function(evt) {
@@ -533,16 +628,15 @@ SC.Drag = SC.Object.extend(
     loc.y -= this.ghostOffset.y ;
     var gV = this.ghostView;
     if(gV) {
-      gV.adjust({ top: loc.y, left: loc.x }) ;   
+      gV.adjust({ top: loc.y, left: loc.x }) ;
       gV.invokeOnce('updateLayout') ;
     }
   },
   
-  /**
+  /** @private
     YES if the ghostView has been manually hidden.
     
-    @private 
-    @type {Boolean}
+    @type Boolean
     @default NO
   */
   _ghostViewHidden: NO,
@@ -669,7 +763,7 @@ SC.Drag = SC.Object.extend(
   
   /** @private
     Performs auto-scrolling for the drag.  This will only do anything if
-    the user keeps the mouse within a few pixels of one location for a little
+    the user keeps the mouse/touch within a few pixels of one location for a little
     while.
     
     Returns YES if a scroll was performed.
@@ -683,7 +777,7 @@ SC.Drag = SC.Object.extend(
     // STEP 1: Find the first view that we can actually scroll.  This view 
     // must be:
     // - scrollable
-    // - the mouse pointer must be within a scrolling hot zone
+    // - the mouse pointer or touch must be within a scrolling hot zone
     // - there must be room left to scroll in that direction. 
     
     // NOTE: an event is passed only when called from mouseDragged
@@ -885,7 +979,7 @@ SC.Drag.mixin(
     @param {SC.View} target a view implementing the SC.DropTarget protocol
   */
   addDropTarget: function(target) {
-    this._dropTargets[SC.guidFor(target)] = target ;
+    this._dropTargets[SC.guidFor(target)] = target;
   },
   
   /**
@@ -897,7 +991,7 @@ SC.Drag.mixin(
     @param {SC.View} target A previously registered drop target
   */
   removeDropTarget: function(target) {
-    delete this._dropTargets[SC.guidFor(target)] ;
+    delete this._dropTargets[SC.guidFor(target)];
   },
   
   /**
@@ -907,7 +1001,7 @@ SC.Drag.mixin(
     @param {SC.View} target The view that should be auto-scrolled
   */
   addScrollableView: function(target) {
-    this._scrollableViews[SC.guidFor(target)] = target ;  
+    this._scrollableViews[SC.guidFor(target)] = target;
   },
   
   /**
@@ -917,7 +1011,7 @@ SC.Drag.mixin(
     @param {SC.View} target A previously registered scrollable view
   */
   removeScrollableView: function(target) {
-    delete this._scrollableViews[SC.guidFor(target)] ;  
+    delete this._scrollableViews[SC.guidFor(target)];
   }
   
-});
+});