sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/desktop/views/web.js

@@ -42,7 +42,8 @@ SC.WebView = SC.View.extend(SC.Control, {/** @scope SC.WebView.prototype */
     @param {Boolean} firstTime
   */
   render: function(context, firstTime) {
-    var src = this.get('value'), iframe;
+    var src = this.get('value') || '',
+      iframe;
 
     if (firstTime) {
       context.push('<iframe src="' + src +

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

@@ -12,7 +12,7 @@ sc_require("views/toolbar");
   You want to use WorkspaceView in one of two situations: iPhone apps where the toolbars
   need to change size automatically based on orientation (this does that, isn't that
   handy!) and iPad apps where you would like the masterIsHidden property to pass through.
-  
+
   @since SproutCore 1.2
   @extends SC.View
   @author Alex Iskander
@@ -26,14 +26,14 @@ SC.WorkspaceView = SC.View.extend(
     @see SC.View#classNames
   */
   classNames: ["sc-workspace-view"],
-  
+
   /**
     @type Array
     @default "hasTopToolbar hasBottomToolbar".w()
     @see SC.View#displayProperties
   */
   displayProperties: ["hasTopToolbar", "hasBottomToolbar"],
-  
+
   /**
     @type String
     @default 'workspaceRenderDelegate'
@@ -45,48 +45,48 @@ SC.WorkspaceView = SC.View.extend(
     @default SC.ToolbarView
   */
   topToolbar: SC.ToolbarView.extend(),
-  
+
   /**
     @type SC.View
     @default null
   */
   bottomToolbar: null,
-  
+
   /**
     The content. Must NOT be null.
-    
+
     @type SC.View
     @default SC.View
   */
   contentView: SC.View.extend(),
-  
+
   /**
     If you want to automatically resize the toolbars like iPhone
     apps should, set to YES.
-    
+
     @type Boolean
     @default NO
   */
   autoResizeToolbars: NO,
-  
+
   /**
     @type Number
     @default 44
   */
   defaultToolbarSize: 44,
-  
+
   /**
     @type Number
     @default 44
   */
   largeToolbarSize: 44,
-  
+
   /**
     @type Number
     @default 30
   */
   smallToolbarSize: 30,
-  
+
   /**
     @field
     @type Number
@@ -96,13 +96,13 @@ SC.WorkspaceView = SC.View.extend(
     if (this.get("orientation") === SC.HORIZONTAL_ORIENTATION) return this.get("smallToolbarSize");
     return this.get("largeToolbarSize");
   }.property("autoHideMaster", "orientation"),
-  
+
   /**
     Tracks the orientation of the view. Possible values:
-    
+
       - SC.HORIZONTAL_ORIENTATION
       - SC.PORTRAIT_ORIENTATION
-    
+
     @field
     @type String
     @default SC.HORIZONTAL_ORIENTATION
@@ -112,22 +112,22 @@ SC.WorkspaceView = SC.View.extend(
     if (f.width > f.height) return SC.HORIZONTAL_ORIENTATION;
     else return SC.VERTICAL_ORIENTATION;
   }.property("frame").cacheable(),
-  
+
   /**
     @type Boolean
     @default NO
   */
   masterIsHidden: NO,
-  
+
   /** @private */
   masterIsHiddenDidChange: function() {
     var t, mih = this.get("masterIsHidden");
     if (t = this.get("topToolbar")) t.set("masterIsHidden", mih);
     if (t = this.get("bottomToolbar")) t.set("masterIsHidden", mih);
   }.observes("masterIsHidden"),
-  
+
   /// INTERNAL CODE. HERE, THERE BE MONSTERS!
-  
+
   /**
     @private
     Whenever something that affects the tiling changes (for now, just toolbarSize, but if
@@ -137,43 +137,43 @@ SC.WorkspaceView = SC.View.extend(
   _scmd_tilePropertyDidChange: function() {
     this.invokeOnce("_scws_tile");
   }.observes("toolbarSize"),
-  
+
   /** @private
     Creates the child views. Specifically, instantiates master and detail views.
   */
   createChildViews: function() {
     sc_super();
-    
+
     var topToolbar = this.get("topToolbar");
     if (topToolbar) {
       topToolbar = this.topToolbar = this.activeTopToolbar = this.createChildView(topToolbar);
-      this.appendChild(topToolbar); 
+      this.appendChild(topToolbar);
     }
-    
+
     var bottomToolbar = this.get("bottomToolbar");
     if (bottomToolbar) {
       bottomToolbar = this.bottomToolbar = this.activeBottomToolbar = this.createChildView(bottomToolbar);
-      this.appendChild(bottomToolbar); 
+      this.appendChild(bottomToolbar);
     }
-    
+
     var content = this.get("contentView");
     content = this.contentView = this.activeContentView = this.createChildView(content);
-    this.appendChild(content); 
-    
+    this.appendChild(content);
+
     this.invokeOnce("_scws_tile");
   },
-  
+
   /**
     @private
     Tiles the views as necessary.
   */
   _scws_tile: function() {
-    var contentTop = 0, contentBottom = 0, 
+    var contentTop = 0, contentBottom = 0,
         topToolbar = this.get("topToolbar"),
         bottomToolbar = this.get("bottomToolbar"),
         content = this.get("contentView"),
         toolbarSize = this.get("toolbarSize");
-      
+
       // basically, if there is a top toolbar, we position it and change contentTop.
     if (topToolbar) {
       topToolbar.set("layout", {
@@ -181,7 +181,7 @@ SC.WorkspaceView = SC.View.extend(
       });
       contentTop += toolbarSize;
     }
-    
+
     // same for bottom
     if (bottomToolbar) {
       bottomToolbar.set("layout", {
@@ -189,21 +189,21 @@ SC.WorkspaceView = SC.View.extend(
       });
       contentBottom += toolbarSize;
     }
-    
+
     // finally, position content
     this.contentView.set("layout", {
       left: 0, right: 0, top: contentTop, bottom: contentBottom
     });
   },
-  
+
   /** @private
     Returns YES if a top toolbar is present.
   */
   hasTopToolbar: function() {
     if (this.get("topToolbar")) return YES;
-    return NO;    
+    return NO;
   }.property("topToolbar").cacheable(),
-  
+
   /** @private
     Returns YES if a bottom toolbar is present.
   */
@@ -211,73 +211,85 @@ SC.WorkspaceView = SC.View.extend(
     if (this.get("bottomToolbar")) return YES;
     return NO;
   }.property("bottomToolbar").cacheable(),
-  
+
   /** @private
     Called by the individual toolbar/contentView observers at runloop end when the toolbars change.
   */
   childDidChange: function() {
     this._scws_tile();
   },
-  
+
   /** @private
     For subclassing, this is the currently displaying top toolbar.
   */
   activeTopToolbar: null,
-  
+
   /** @private
     For subclassing, this is the currently displaying bottom toolbar.
   */
   activeBottomToolbar: null,
-  
+
   /** @private
     For subclassing, this is the currently displaying content view.
   */
   activeContentView: null,
-  
+
   /** @private
-    Called when the top toolbar changes. It appends it, removes any old ones, and calls toolbarsDidChange. 
-    
+    Called when the top toolbar changes. It appends it, removes any old ones, and calls toolbarsDidChange.
+
     You may want to override this if, for instance, you want to add transitions of some sort (should be trivial).
   */
   topToolbarDidChange: function() {
     var active = this.activeTopToolbar, replacement = this.get("topToolbar");
     if (active) {
-      this.removeChild(active);
+      if (active.createdByParent) {
+        container.removeChildAndDestroy(active);
+      } else {
+        container.removeChild(active);
+      }
     }
     if (replacement) {
       this.appendChild(replacement);
     }
-    
+
     this.activeTopToolbar = replacement;
     this.invokeLast("childDidChange");
   }.observes("topToolbar"),
-  
+
   /**
     @private
   */
   bottomToolbarDidChange: function() {
     var active = this.activeBottomToolbar, replacement = this.get("bottomToolbar");
     if (active) {
-      this.removeChild(active);
+      if (active.createdByParent) {
+        container.removeChildAndDestroy(active);
+      } else {
+        container.removeChild(active);
+      }
     }
     if (replacement) {
       this.appendChild(replacement);
     }
-    
+
     this.activeBottomToolbar = replacement;
     this.invokeLast("childDidChange");
   }.observes("bottomToolbar"),
-  
+
   /** @private */
   contentViewDidChange: function() {
     var active = this.activeContentView, replacement = this.get("contentView");
     if (active) {
-      this.removeChild(active);
+      if (active.createdByParent) {
+        container.removeChildAndDestroy(active);
+      } else {
+        container.removeChild(active);
+      }
     }
     if (replacement) {
       this.appendChild(replacement);
     }
-    
+
     this.activeContentView = replacement;
     this.invokeLast("childDidChange");
   }.observes("contentView")

data/lib/frameworks/sproutcore/frameworks/experimental/Buildfile

@@ -1,16 +1,7 @@
-config :designer, :required => [:runtime, :foundation, :desktop]
-
 config :forms, :required => :desktop
 
 config :scroll_view, :required => [:runtime, :foundation, :desktop]
 
 config :menu, :required => [:'experimental/scroll_view']
 
-config :greenhouse,
-  :required => [:sproutcore, :designer, :statechart],
-  :theme => :ace,
-  :css_theme => 'ace.greenhouse'
-
 config :polymorphism, :required => :datastore
-
-config :split_view, :required => :foundation

data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/device_motion/device.js

@@ -9,18 +9,18 @@ sc_require('platform');
 
 /**
   ## Device Motion
-  
+
   When a device is moved, some platforms will inform us of its movement
-  (accelerometer) and angle (gyroscope). 
-  
+  (accelerometer) and angle (gyroscope).
+
 */
 SC.mixin(SC.device,
 /** @scope SC.device */ {
-  
+
   // ..........................................................
   // PROPERTIES
-  // 
-  
+  //
+
   /*
     TODO [CC] There shouldn't be a need for this property, we should overload
               the addObserver/removeObserver functions and check for the
@@ -29,8 +29,8 @@ SC.mixin(SC.device,
   /**
     Because the device motion events fire every 50ms, for performance reasons
     you must opt into listening for those events.
-    
-    @property {Boolean}
+
+    @type Boolean
     @default NO
   */
   listenForDeviceMotion: NO,
@@ -39,37 +39,37 @@ SC.mixin(SC.device,
     Amount, in degrees, that the device is rotated around its x axis. x axis is
     the plane of the screen and is positive towards the right hand side of
     the screen, regardless of orientation.
-    
+
     SC.device#listenForDeviceMotion must be true for this property to update.
-    
-    @property {Number}
+
+    @type Number
     @default 0
   */
   rotationX: 0,
-  
+
   /**
     Amount, in degrees, that the device is rotated around its y axis (axis runs
     from the top to the bottom of the device). y axis is the plane of the
     screen and is positive towards the top of the screen, regardless of
     orientation.
-    
+
     SC.device#listenForDeviceMotion must be true for this property to update.
-    
-    @property {Number}
+
+    @type Number
     @default 0
   */
   rotationY: 0,
-  
+
   /**
     Amount, in degrees, that the device is rotated around its z axis (normal
     coming "out" of the screen). z axis is perpendicular to the screen and is
     positive "out" of (or normal to) the screen. This property is only useful
     if the device has a gyroscope; for devices which lack a gyroscope (use
     an accelerometer or nothing), this property remains 0.
-    
+
     SC.device#listenForDeviceMotion must be true for this property to update.
-    
-    @property {Number}
+
+    @type Number
     @default 0
   */
   rotationZ: 0,
@@ -77,20 +77,20 @@ SC.mixin(SC.device,
 
   // ..........................................................
   // SETUP
-  // 
-  
+  //
+
   setupMotion: function() {
     SC.RootResponder.responder.listenFor(['devicemotion', 'deviceorientation'], window, this);
   },
-  
-  
+
+
   // ..........................................................
   // DEVICE MOTION HANDLING
-  // 
-  
+  //
+
   _scd_listenForDeviceMotionDidChange: function() {
     if (!SC.RootResponder.responder) return;
-    
+
     // we only care about the gyro now, we don't need acceleration
     if (this.get('listenForDeviceMotion')) {
       if (SC.platform.hasGyroscope) {
@@ -105,31 +105,31 @@ SC.mixin(SC.device,
       SC.Event.remove(window, 'devicemotion', this, this._scd_devicemotionPoll);
     }
   },
-  
+
   /**
     Fired once every 50ms, informing us of the gyroscope measurements
   */
   deviceorientation: function(evt) {
     evt = evt.originalEvent;
-    
+
     if (!SC.platform.hasGyroscope) SC.platform.hasGyroscope = YES;
-    
+
     SC.Event.remove(window, 'deviceorientation', this, this.deviceorientation);
     SC.Event.remove(window, 'devicemotion', this, this.devicemotion);
-    
+
     this.addObserver('listenForDeviceMotion', this, this._scd_listenForDeviceMotionDidChange);
     this.notifyPropertyChange('listenForDeviceMotion');
   },
-  
+
   /** @private
     Gets called after the first deviceorientation event, used to actually set
     the rotation values
   */
   _scd_deviceorientationPoll: function(evt) {
     var orientation = this.get('orientation');
-    
+
     evt = evt.originalEvent;
-    
+
     SC.run(function() {
       this.beginPropertyChanges();
       this.set('rotationX', orientation !== 'landscape' ? evt.beta : evt.gamma);
@@ -138,26 +138,26 @@ SC.mixin(SC.device,
       this.endPropertyChanges();
     }, this);
   },
-  
+
   /** @private
     Because we only want to deal with only the gyroscope, if it is firing its event,
     we wait until two devicemotion events have been fired to decide to use the
     accelerometer instead.
   */
   _devicemotionCalled: NO,
-  
+
   /**
     Fired every 50ms, informing us of the accelerometer measurements
   */
   devicemotion: function(evt) {
     if (!SC.platform.hasAccelerometer) SC.platform.hasAccelerometer = YES;
-    
+
     if (this._devicemotionCalled) {
       // if this happens, and this event fires (ie. the deviceorientation event hasn't)
       // then we assume the device does not have a gyroscope
       SC.Event.remove(window, 'deviceorientation', this, this.deviceorientation);
       SC.Event.remove(window, 'devicemotion', this, this.devicemotion);
-      
+
       this.set('rotationZ', 0); // ensure rotationZ does not get any other value
       this.addObserver('listenForDeviceMotion', this, this._scd_listenForDeviceMotionDidChange);
       this.notifyPropertyChange('listenForDeviceMotion');
@@ -165,7 +165,7 @@ SC.mixin(SC.device,
       this._devicemotionCalled = YES;
     }
   },
-  
+
   /*
     TODO [CC] This needs to be expanded on a bit. If you hold the device in weird
               positions, the rotation values from the accelerometer no longer match those
@@ -180,26 +180,26 @@ SC.mixin(SC.device,
         spread = max - min,
         orientation = this.get('orientation'),
         aX, aY, rX, rY, swap;
-    
+
     evt = evt.originalEvent;
-    
+
     aX = evt.accelerationIncludingGravity.x;
     aY = evt.accelerationIncludingGravity.y;
-    
+
     if (aX < min) aX = min;
     else if (aX > max) aX = max;
     if (aY < min) aY = min;
     else if (aY > max) aY = max;
-    
+
     if (orientation === 'landscape') {
       swap = aX;
       aX = aY;
       aY = swap;
     }
-    
+
     rX = 90 - ((aY-min)/spread) * 180;
     rY = -90 + ((aX-min)/spread) * 180;
-    
+
     SC.run(function() {
       this.beginPropertyChanges();
       this.set('rotationX', rX);
@@ -212,4 +212,4 @@ SC.mixin(SC.device,
 
 SC.ready(function() {
   SC.device.setupMotion();
-});
+});