sproutcore 0.9.17 → 0.9.18

data/frameworks/sproutcore/views/split_divider.js

@@ -6,104 +6,107 @@
 require('views/view') ;
 require('views/split');
 
-/** 
+/**
   @class
 
-  A SplitDividerView displays a divider between two split views.  Clicking
-  and dragging the divider will change the thickness of the view either to 
-  the left or right of the divider, depending on which side of the flexible
-  view the divider is on.
-  
-  Double-clicking will try to collapse the same view so it is not visible
-  unless you have canCollapse disabled on the SplitView.
-  
-  This view must be a direct child of the split view it works with.
-  
+  A SplitDividerView displays a divider between two views within a SplitView.
+  Clicking and dragging the divider will change the thickness of each view
+  either to the top/left or bottom/right of the divider.
+
+  Double-clicking on the SplitDividerView will try to collapse the first
+  view within the SplitView that has property canCollapse set to true,
+  so it is not visible, unless you have canCollapse disabled on the SplitView.
+
+  This view must be a direct child of the split view it works with. It must
+  be surrounded by two other views.
+
   @extends SC.View
-  
+
   @author Charles Jolley
+  @author Lawrence Pit
 */
 SC.SplitDividerView = SC.View.extend(
 /** @scope SC.SplitDividerView.prototype */ {
-  
+
   emptyElement: '<div class="sc-split-divider-view"></div>',
 
-  /**
-    Returns the view to be managed by the divider view.
-  */
-  targetView: function() {  
-    var splitView = this.get('parentNode') ;
-    if (!splitView) return null ;
-
-    var flexibleView = splitView.computeFlexibleView() ;
-    var views = splitView.get('childNodes') ;
-    var myIndex = views.indexOf(this) ;
-    var flexibleIndex = views.indexOf(flexibleView) ;
-    
-    if (myIndex < 0) throw "SplitDividerView must belong to the SplitView";
-    
-    return (myIndex <= flexibleIndex) ? this.get('previousSibling') : this.get('nextSibling') ;
-
-  }.property(),
-  
   mouseDown: function(evt) {
-
-    var splitView = this.get('parentNode') ;
-    if (!splitView) return ;
-    
     // cache some info for later use.
     this._mouseDownLocation = Event.pointerLocation(evt) ;
+    this._splitView = this.get('parentNode') ;
+    this._tlView = this.get('previousSibling') ;
+    this._brView = this.get('nextSibling') ;
+    this._originalTopLeftThickness = this._splitView.getThicknessForView(this._tlView) ;
+    this._direction = this._splitView.get('layoutDirection') ;
 
-    this._targetView = this.get('targetView') ;
-    
-    // determine the view to change.
-    this._originalThickness = splitView.thicknessForView(this._targetView);
-    
-    this._direction = splitView.get('layoutDirection') ;
-    
     // return true so we can track mouse dragged.
     return true ;
   },
-  
+
   mouseDragged: function(evt) {
-    
-    // calculate new thickness
+    // calculate new thickness requested by mouse
     var loc = Event.pointerLocation(evt) ;
-    
+
     if (this._direction == SC.HORIZONTAL) {
       var offset = loc.x - this._mouseDownLocation.x ;
     } else {
       var offset = loc.y - this._mouseDownLocation.y ;
     }
 
-    var thickness = this._originalThickness + offset ;
-    var splitView = this.get('parentNode') ;
-    splitView.setThicknessForView(this._targetView, thickness) ;
-    
+    var proposedThickness = this._originalTopLeftThickness + offset ;
+    this._splitView.setThicknessForView(this._tlView, proposedThickness) ;
+    this._setCursorStyle() ;
     return true ;
   },
-  
+
   // clear left overs.
   mouseUp: function(evt) {
-    this._targetView = this._originalThickness = this._direction = this._mouseDownLocation = null ;
+    this._mouseDownLocation = this._originalTopLeftThickness = null ;
   },
-  
+
   doubleClick: function(evt) {
-    var splitView = this.get('parentNode') ;
-    if (!splitView) return; // nothing to do.
-    
-    // try to collapse or un-collapse.
-    var targetView = this.get('targetView');
-    var isCollapsed = targetView.get('isCollapsed') || NO;
-    
-    // do not collapse if not allowed.
-    if (!isCollapsed && !splitView.canCollapseView(targetView)) return; 
-    
-    // now set the collapsed state and layout.
-    targetView.set('isCollapsed', !isCollapsed) ;
-    splitView.layout() ;
-    
+    var view = this._tlView ;
+    var isCollapsed = view.get('isCollapsed') || NO ;
+    if (!isCollapsed && !this._splitView.canCollapseView(view)) {
+      view = this._brView ;
+      isCollapsed = view.get('isCollapsed') || NO ;
+      if (!isCollapsed && !this._splitView.canCollapseView(view)) return;
+    }
+
+    if (!isCollapsed) {
+      // remember thickness in it's uncollapsed state
+      view._uncollapsedThickness = this._splitView.getThicknessForView(view)  ;
+      // and collapse
+      this._splitView.setThicknessForView(view, 0) ;
+      // if however the splitview decided not to collapse, clear:
+      if (!view.get("isCollapsed")) {
+        view._uncollapsedThickness = null;
+      }
+    } else {
+      // uncollapse to the last thickness in it's uncollapsed state
+      this._splitView.setThicknessForView(view, view._uncollapsedThickness) ;
+      view._uncollapsedThickness = null ;
+    }
+    this._setCursorStyle() ;
     return true ;
+  },
+
+  _setCursorStyle: function() {
+    tlThickness = this._splitView.getThicknessForView(this._tlView) ;
+    brThickness = this._splitView.getThicknessForView(this._brView) ;
+    if (this._tlView.get('isCollapsed') ||
+        tlThickness == this._tlView.get("minThickness") ||
+        brThickness == this._brView.get("maxThickness"))
+    {
+      this.setStyle({cursor: this._direction == SC.HORIZONTAL ? "e-resize" : "s-resize" }) ;
+    } else if (this._brView.get('isCollapsed') ||
+               tlThickness == this._tlView.get("maxThickness") ||
+               brThickness == this._brView.get("minThickness"))
+    {
+      this.setStyle({cursor: this._direction == SC.HORIZONTAL ? "w-resize" : "n-resize" }) ;
+    } else {
+      this.setStyle({cursor: this._direction == SC.HORIZONTAL ? "ew-resize" : "ns-resize" }) ;
+    }
   }
-  
+
 });

data/frameworks/sproutcore/views/view.js

@@ -949,7 +949,7 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
     
     var f ;
     if (this._innerFrame == null) {  
-
+      
       // get the base frame
       // The _collectInnerFrame function is set at the bottom of this file
       // based on the browser type.
@@ -970,19 +970,34 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
       
       // fix the x & y with the clientTop/clientLeft
       var clientLeft, clientTop ;
-      if (el.clientLeft == null) {
-        clientLeft = parseInt(this.getStyle('border-left-width'),0) || 0 ;
-      } else clientLeft = el.clientLeft ;
+      
+      if (SC.Platform.IE) {
+        if (!el.width) {
+          clientLeft = parseInt(this.getStyle('border-left-width'),0) || 0 ;
+        } else clientLeft = el.clientLeft ;
 
-      if (el.clientTop == null) {
-        clientTop = parseInt(this.getStyle('border-top-width'),0) || 0 ;
-      } else clientTop = el.clientTop ;
+        if (!el.height) {
+          clientTop = parseInt(this.getStyle('border-top-width'),0) || 0 ;
+        } else clientTop = el.clientTop ;
+
+        f.x += clientLeft; f.y += clientTop;
+      }
+      else {
+        if (el.clientLeft == null) {
+          clientLeft = parseInt(this.getStyle('border-left-width'),0) || 0 ;
+        } else clientLeft = el.clientLeft ;
 
-      f.x += clientLeft; f.y += clientTop;
+        if (el.clientTop == null) {
+          clientTop = parseInt(this.getStyle('border-top-width'),0) || 0 ;
+        } else clientTop = el.clientTop ;
+
+        f.x += clientLeft; f.y += clientTop;
+      }
       
       // cache this frame if using manual layout mode
       this._innerFrame = SC.cloneRect(f);
     } else f = SC.cloneRect(this._innerFrame) ;
+    // console.log('returning x:%@ y:%@ w:%@ h:%@'.fmt(f.x, f.y, f.width, f.height));
     return f ;
   }.property('frame'),
 
@@ -1049,7 +1064,8 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
         while(--idx >= 0) {
           padding += parseInt(this.getStyle(SC.View.WIDTH_PADDING_STYLES[idx]), 0) || 0;
         }
-        style.width = (Math.floor(f.width) - padding).toString() + 'px' ;
+        var width = Math.floor(f.width) - padding ;
+        if (!isNaN(width)) style.width = width.toString() + 'px' ;
       }
       
       // Resize Height
@@ -1060,7 +1076,8 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
         while(--idx >= 0) {
           padding += parseInt(this.getStyle(SC.View.HEIGHT_PADDING_STYLES[idx]), 0) || 0;
         }
-        style.height = (Math.floor(f.height) - padding).toString() + 'px' ;
+        var height = Math.floor(f.height) - padding ;
+        if(!isNaN(height)) style.height = height.toString() + 'px' ;
       }
 
       // now apply style change and clear the cached frame
@@ -1267,14 +1284,40 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
     var f;
     if (this._scrollFrame == null) {
       var el = this.rootElement ;
-      f = this._collectFrame(function() {
-        return { 
-          x: 0 - el.scrollLeft, 
-          y: 0 - el.scrollTop, 
-          width: el.scrollWidth, 
-          height: el.scrollHeight 
+      var func;
+      if (SC.isIE()) {
+        func = function() {
+          var borderTopWidth = 0;
+          var borderBottomWidth = 0;
+          var borderLeftWidth = 0;
+          var borderRightWidth = 0;
+          
+          var overflow = el.currentStyle.overflow;
+          if ( overflow != 'hidden' && overflow != 'auto' ) {
+            borderTopWidth = parseInt(el.currentStyle.borderTopWidth, 0) || 0 ;
+            borderBottomWidth = parseInt(el.currentStyle.borderBottomWidth, 0) || 0 ;
+            borderLeftWidth = parseInt(el.currentStyle.borderLeftWidth, 0) || 0 ;
+            borderRightWidth = parseInt(el.currentStyle.borderRightWidth, 0) || 0 ;
+          }
+          return { 
+            x: 0 - el.scrollLeft, 
+            y: 0 - el.scrollTop, 
+            width: el.scrollWidth + borderLeftWidth + borderRightWidth, 
+            height: Math.max(el.scrollHeight, el.clientHeight) + borderTopWidth + borderBottomWidth
+          };
         };
-      }) ;
+      }
+      else {
+        func = function() {
+          return { 
+            x: 0 - el.scrollLeft, 
+            y: 0 - el.scrollTop, 
+            width: el.scrollWidth, 
+            height: el.scrollHeight 
+          };
+        };
+      }
+      f = this._collectFrame(func);
       
       // cache this frame if using manual layout mode
       this._scrollFrame = SC.cloneRect(f);
@@ -2207,18 +2250,15 @@ if (SC.Platform.IE) {
   // case always use the scrollWidth/Height.
   SC.View._collectInnerFrame = function() {
     var el = this.rootElement ;
-    var hasLayout = (el.currentStyle) ? el.currentStyle.hasLayout : NO ;
+    var hasLayout = (el.currentStyle) ? el.currentStyle.hasLayout : false ;
     var borderTopWidth = parseInt(el.currentStyle.borderTopWidth, 0) || 0 ;
     var borderBottomWidth = parseInt(el.currentStyle.borderBottomWidth, 0) || 0 ;
-    var scrollHeight = el.offsetHeight-borderTopWidth-borderBottomWidth;
-    if(el.clientWidth > el.scrollWidth)
-    {
-      scrollHeight-15;
-    }
+    var scrollHeight = el.offsetHeight - borderTopWidth - borderBottomWidth ;
+    if (el.clientWidth > el.scrollWidth) scrollHeight - 15 ;
     
     return { 
-      x: el.offsetLeft, 
-      y: el.offsetTop, 
+      x: el.offsetLeft,
+      y: el.offsetTop,
       width: (hasLayout) ? Math.min(el.scrollWidth, el.clientWidth) : el.scrollWidth, 
       height: (hasLayout) ? Math.min(scrollHeight, el.clientHeight) : scrollHeight
     };

data/lib/sproutcore.rb

@@ -21,8 +21,11 @@ module SproutCore
 end
 
 # Force load the code files.  Others may be loaded only as required
-%w(library bundle bundle_manifest bundle_installer jsdoc jsmin version).each do |fname|
+%w(library bundle bundle_manifest bundle_installer jsdoc jsmin cssmin version).each do |fname|
   require "sproutcore/#{fname}"
 end
+%w(erubis haml sass).each do |fname|
+  require "sproutcore/renderers/#{fname}"
+end
 
 SC= SproutCore

data/lib/sproutcore/build_tools/html_builder.rb

@@ -1,4 +1,3 @@
-require 'erubis'
 require 'sproutcore/helpers'
 require 'sproutcore/view_helpers'
 
@@ -17,9 +16,10 @@ module SproutCore
       include SproutCore::Helpers::TextHelper
       include SproutCore::Helpers::CaptureHelper
       include SproutCore::Helpers::StaticHelper
+      include SproutCore::Helpers::DomIdHelper
       include SproutCore::ViewHelpers
 
-      attr_reader :entry, :bundle, :entries, :filename, :language, :library
+      attr_reader :entry, :bundle, :entries, :filename, :language, :library, :renderer
 
       def initialize(entry, bundle, deep=true)
         @entry = nil
@@ -56,61 +56,65 @@ module SproutCore
       # Actually builds the HTML file from the entry (actually from any
       # composite entries)
       def build
-
         @layout_path = bundle.layout_path
 
-        # Render each filename.  By default, the output goes to the resources
-        # string
-        @content_for_resources = ''
-        entries.each { |fn| _render_one(fn) }
+        # Render each filename. By default, the output goes to the :resources
+        # content section
+        entries.each do |entry|
+          content_for :resources do
+            _build_one(entry)
+          end
+        end
 
         # Finally, render the layout.  This should produce the final output to
         # return
-        input = File.read(@layout_path)
-        
-        # render using either erb or haml
-        case File.extname(@layout_path)
-        when /\.rhtml$/, /\.html.erb$/
-          return eval(Erubis::Eruby.new.convert(input))
-        when /\.haml$/, /\.html.haml$/
-          require 'haml'
-          return Haml::Engine.new(input).to_html(self)
-        end
+        _render(@layout_path)
       end
 
-      # render a single entry
-      def _render_one(entry)
-        @entry = entry
-        @filename = @entry.filename
-
-        # avoid double render of layout path
-         return if @entry.source_path == @layout_path
-
-        # render. Result goes into @content_for_resources
-        input = File.read(@entry.source_path)
-        
-        # render using either erb or haml
-        case File.extname(@entry.source_path)
-        when /\.rhtml$/, /\.html.erb$/
-          @content_for_resources += eval(Erubis::Eruby.new.convert(input))
-        when /\.haml$/, /\.html.haml$/
-          require 'haml'
-          @content_for_resources += Haml::Engine.new(input).to_html(self)
-        end
-
-        @filename =nil
-        @entry = nil
-      end
-
-
       # Returns the current bundle name.  Often useful for generating titles,
       # etc.
       def bundle_name; bundle.bundle_name; end
 
-      #### For Rails Compatibility.  render() does not do anything useful
-      # since the new build system is nice about putting things into the right
-      # place for output.
-      def render; ''; end
+      private
+
+        # Builds a single entry
+        def _build_one(entry)
+          # avoid double render of layout path
+          return if entry.source_path == @layout_path
+
+          @entry = entry
+          @filename = @entry.filename
+          begin
+            _render(@entry.source_path)
+          ensure
+            @filename = nil
+            @entry = nil
+          end
+        end
+
+        def _render(file_path)
+          SC.logger.debug("~ Rendering #{file_path}")
+          input = File.read(file_path)
+          @renderer = case file_path
+          when /\.rhtml$/, /\.html.erb$/
+            Sproutcore::Renderers::Erubis.new(self)
+          when /\.haml$/
+            Sproutcore::Renderers::Haml.new(self)
+          end
+          _render_compiled_template( @renderer.compile(input) )
+        end
+
+        # Renders a compiled template within this context
+        def _render_compiled_template(compiled_template)
+          self.instance_eval "def __render(); #{compiled_template}; end"
+          begin
+            self.send(:__render) do |*names|
+              self.instance_variable_get("@content_for_#{names.first}")
+            end
+          ensure
+            class << self; self end.class_eval{ remove_method(:__render) } rescue nil
+          end
+        end
 
     end