sproutcore 0.9.9 → 0.9.10

data/frameworks/sproutcore/mixins/scrollable.js

@@ -104,7 +104,9 @@ SC.Scrollable = {
 
     // compute new sf
     var newSf = { x: sf.x - (amount.x || 0), y: sf.y - (amount.y || 0) } ;
-    newSf = this.set('scrollFrame', newSf) ;
+    this.set('scrollFrame', newSf) ;
+    newSf = this.get('scrollFrame') ;
+    
     return { x: newSf.x - sf.x, y: newSf.y - sf.y }; 
   },
 
@@ -141,8 +143,8 @@ SC.Scrollable = {
     };
 
     // if top edge is not visible, shift origin
-    vo.y += Math.max(0, SC.minY(vo) - SC.minY(vf)) ;
-    vo.x += Math.max(0, SC.minX(vo) - SC.minX(vf)) ;
+    vo.y -= Math.max(0, SC.minY(vo) - SC.minY(vf)) ;
+    vo.x -= Math.max(0, SC.minX(vo) - SC.minX(vf)) ;
 
     // if bottom edge is not visible, shift origin
     vo.y += Math.max(0, SC.maxY(vf) - SC.maxY(vo)) ;

data/frameworks/sproutcore/tests/views/view/innerFrame.rhtml

@@ -112,7 +112,9 @@ Test.context("CASE 3: manual-layout view with some padding and no border", {
   },
 
   "after frame change, innerFrame should == frame less border, viewFrameDidChange is not required.": function() {
-    var f = this.v.set('frame', { width: 50, x: 10, y: 10, height: 50 }) ;
+    var f ;
+    
+    this.v.set('frame', f = { width: 50, x: 10, y: 10, height: 50 }) ;
     f.x += CASE3_OFFSET; f.y += CASE3_OFFSET;
     f.width -= (CASE3_OFFSET*2); f.height -= (CASE3_OFFSET*2) ;
     //console.log('f: %@ if: %@'.fmt($H(f).inspect(), $H(this.v.get('innerFrame')).inspect()));

data/frameworks/sproutcore/views/button/button.js

@@ -184,6 +184,21 @@ SC.ButtonView = SC.View.extend(SC.Control,
     return this._title ;
   }.property(),
   
+  /**
+    The button href value.
+      
+    This property is observable and bindable. Can be used to create localized button href values.
+  */
+  href: function(key, value) {
+    var el = this.rootElement;
+    if (value !== undefined) {
+      if (el) {
+        el.setAttribute('href', value);
+      }
+    }
+    return (el) ? el.getAttribute('href') : null;
+  }.property(),
+
   /**
     The name of the action you want triggered when the button is pressed.  
     

data/frameworks/sproutcore/views/field/textarea_field.js

@@ -18,6 +18,14 @@ SC.TextareaFieldView = SC.TextFieldView.extend(
 /** @scope SC.TextareaFieldView.prototype */ {
   
   emptyElement: '<textarea></textarea>',
+  didBecomeFirstResponder: function() {
+    if (this.get('isVisibleInWindow')) {
+      this.rootElement.focus();
+	    this.invokeLater(this._selectRootElement, 1) ;
+    }
+    // hide the hint text if it is showing.
+    this._updateFieldHint() ;
+  },
 
   insertNewline: function(evt) { evt._stopWhenHandled = false; return true; }
 

data/frameworks/sproutcore/views/form.js

@@ -7,39 +7,45 @@ require('views/view') ;
 require('views/button/button') ;
 require('views/field/text_field') ;
 
-// FormView provides a simple way for you to "stage" input by capturing
-// data from your views into the form before it is set on your actual
-// content object.
-//
-// HOW IT WORKS
-//
-// On startup, FormView will walk any child views looking for any views 
-// with the property "fieldKey".  Any views with this key will be saved as
-// fields on the form.  You can access their value directly on the form by
-// getting the value of fieldKey.
-//
-// Used this way, you can easily combine multiple views into a single,
-// bindable object.  To gain the full functionality however, you should use
-// the content commit capability.
-//
-// IMPORTANT:  FormView defines some properties of its own.  If you try to
-// name your fields with properties already declared in FormView, they will
-// be ignored and a warning will be logged to the console.
-//
-// CONTENT COMMIT
-//
-// If you set the content object on a form view, then the form fields will
-// automatically be bound to the same named keys on the content object.  When
-// the content object value's change, the fields on the form will update
-// automatically.  However, changing values in the fields will not update
-// the content object until the form is committed.
-//
-// You can commit a form promgramatically by calling the commit() method on
-// the form view.  Alternatively, you can add a button to the form with the
-// outlet name submitButton and it will be automatically wired to submit 
-// the form.  You can also create a button named resetButton, it will be 
-// automatically wired to reset the form.
-// 
+/**
+  FormView provides a simple way for you to focus a group of views onto a 
+  single content object or set of content objects.  It can also be used to
+  "stage" input by buffering data from your views into the form before it is 
+  set on your actual content object.  This approach is generally deprecated 
+  however as the Controller objects now provide this same buffering feature
+  in a more robust way.
+
+  h2. How It Works
+
+  On startup, FormView will walk any child views looking for any views 
+  with the property "fieldKey".  Any views with this key will be saved as
+  fields on the form.  You can access their value directly on the form by
+  getting the value of fieldKey.
+
+  Used this way, you can easily combine multiple views into a single,
+  bindable object.  To gain the full functionality however, you should use
+  the content commit capability.
+
+  IMPORTANT:  FormView defines some properties of its own.  If you try to
+  name your fields with properties already declared in FormView, they will
+  be ignored and a warning will be logged to the console.
+
+  h2. Content Commit
+
+  If you set the content object on a form view, then the form fields will
+  automatically be bound to the same named keys on the content object.  When
+  the content object value's change, the fields on the form will update
+  automatically.  Likewise, if you change the value of the field, the value
+  of the content object will generally be changed as wel.
+  
+  If you prefer, you can also turn on buffered commits by setting the 
+  commitChangesImmediately property to NO.  This will cause the form to 
+  buffer any changes to the field values and only forwards them to the content
+  when you call commitChanges() on the form.  This method of buffering is
+  still supported for some simple cases, however it is better to use the newer
+  Controller objects that provide this same buffering in a more robust way.
+
+*/
 SC.FormView = SC.View.extend({
 
   // PROPERTIES

data/frameworks/sproutcore/views/popup_menu.js

@@ -127,17 +127,13 @@ SC.PopupMenuView = SC.View.extend({
       if (w > requiredWidth) requiredWidth = w ;
       child = child.get('nextSibling') ;
     }
-    
-    // loop through children again, set their widths to the required with.
-    var size = { width: requiredWidth } ;
-    var child = this.get('firstChild') ;
-    while(child) {
-      child.set('size',size) ;
-      child = child.get('nextSibling') ;
-    }
-    
-    // set this view to the same size.
-    this.set('size',size) ;
+   var oldWidth = this.get("size").width;
+   if(requiredWidth != oldWidth)
+   {
+     var size = { width: requiredWidth };
+     // set this view to the same size.
+     this.set('size',size) ;
+   }
   }
   
 });

data/frameworks/sproutcore/views/view.js

@@ -61,7 +61,7 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
     @param view {SC.View} the view to insert as a child node.
     @param beforeView {SC.View} view to insert before, or null to insert at 
      end
-    @returns {void}
+    @returns {SC.View} the receiver
   */
   insertBefore: function(view, beforeView) { 
     this._insertBefore(view,beforeView,true);
@@ -125,7 +125,7 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
     This will also remove the view's DOM element from the recievers DOM.
     
     @param view {SC.View} the view to remove
-    @returns {void}
+    @returns {SC.View} the receiver
   */
   removeChild: function(view) {
     if (!view) return ;
@@ -163,6 +163,7 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
     
     view.didRemoveFromParent(this) ;
     this.didRemoveChild(view);
+    return this;
   },
 
   /**
@@ -175,31 +176,54 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
 
     @param view {SC.View} the view to insert in the DOM
     @param view {SC.View} the view to remove from the DOM.
-    @returns {void}
+    @returns {SC.View} the receiver
   */
   replaceChild: function(view, oldView) {
     this.insertBefore(view,oldView) ; this.removeChild(oldView) ;
+    return this;
   },
 
   /**
     Removes the receiver from its parentNode.  If the receiver does not belong
     to a parentNode,  this method does nothing.
     
-    @returns {void}
+    @returns {null}
   */
   removeFromParent: function() {
     if (this.parentNode) this.parentNode.removeChild(this) ;    
+    return null ;
   },
 
+  /** 
+    Works just like removeFromParent but also removes the view from internal
+    caches and sets the rootElement to null so that the view and its DOM can
+    be garbage collected.
+    
+    SproutCore includes special gaurds that ensure views and their related 
+    DOM elements will be garbage collected whenever your web page unloads.
+    However, if you create and destroy views frequently while your application
+    is running, you should call this method when views are no longer needed
+    to ensure they will be garbage collected even while your application is
+    still running.
+    
+    @returns {null}
+  */
+  destroy: function() {
+    this.removeFromParent() ;
+    delete SC.View._view[SC.guidFor(this)];
+    return null ;
+  },
+  
   /**
     Appends the specified view to the end of the receivers childNodes array.  
     This is equivalent to calling insertBefore(view, null);
     
     @param view {SC.View} the view to insert
-    @returns {void}
+    @returns {SC.View} the receiver 
   */
   appendChild: function(view) {
-    this.insertBefore(view,null) ;    
+    this.insertBefore(view,null) ;   
+    return this ; 
   },
 
   /**
@@ -636,7 +660,7 @@ SC.View = SC.Responder.extend(SC.PathModule,  SC.DelegateSupport,
     @returns {String} the set attribute name
   */
   setAttribute: function(attrName, value) {
-    this.rootElement.setAttribute(atrrName, value) ;
+    this.rootElement.setAttribute(attrName, value) ;
   },
   
   /**

data/lib/sproutcore/bundle.rb

@@ -81,9 +81,10 @@ module SproutCore
     
     attr_reader :bundle_name, :bundle_type, :required_bundles, :preferred_language
     attr_reader :javascript_libs, :stylesheet_libs
-    attr_reader :library, :public_root, :url_prefix, :index_prefix
+    attr_reader :library, :public_root, :url_prefix, :index_prefix, :build_prefix
     attr_reader :source_root, :build_root, :url_root, :index_root
     attr_reader :build_mode, :layout
+    attr_reader :make_resources_relative
 
     def library_root
       @library_root ||= library.nil? ? nil : library.root_path
@@ -175,10 +176,15 @@ module SproutCore
       
       #  public_root::       The root directory accessible to the web browser.
       @public_root = normalize_path(opts[:public_root] || 'public')
-      #
+      
+      @make_resources_relative = opts[:resources_relative] || false
+      
       #  url_prefix::        The prefix to put in front of all resource requests. 
-      @url_prefix = opts[:url_prefix] || opts[:resources_at] || opts[:at] || 'static'
-      # 
+      @url_prefix = opts[:url_prefix] || opts[:resources_at] || opts[:at] || (make_resources_relative ? '../..' : 'static')
+      
+      #  build_prefix::      The prefix to put in front of the built files directory.  Generally if you are using absolute paths you want your build_prefix to match the url_prefix.  If you are using relative paths, you don't want a build prefix.
+      @build_prefix = opts[:build_prefix] || (make_resources_relative ? '' : url_prefix)
+      
       #  index_prefix::      The prefix to put in front of all index.html request.
       @index_prefix = opts[:index_prefix] || opts[:index_at] || ''
 
@@ -188,10 +194,17 @@ module SproutCore
       @source_root = normalize_path(opts[:source_root] || File.join(bundle_type.to_s.pluralize, bundle_name.to_s))
 
       #  build_root::        The directory that should contain the built files.
-      @build_root = normalize_path(opts[:build_root] || File.join(public_root, url_prefix.to_s, bundle_name.to_s))
+      @build_root = normalize_path(opts[:build_root] || File.join(public_root, build_prefix.to_s, bundle_name.to_s))
       
       #  url_root::          The url that can be used to reach the built resources
-      @url_root = opts[:url_root] || ['', (url_prefix.nil? || url_prefix.size==0) ? nil : url_prefix, bundle_name.to_s].compact.join('/')
+      
+      # Note that if the resources are relative, we don't want to include a
+      # '/' at the front.  Using nil will cause it to be removed during
+      # compact.
+      @url_root = opts[:url_root] || [
+        (make_resources_relative ? nil : ''), 
+        (url_prefix.nil? || url_prefix.size==0) ? nil : url_prefix, 
+        bundle_name.to_s].compact.join('/')
 
       #  index_root::        The root url that can be used to reach retrieve the index.html.
       @index_root = opts[:index_root] || ['',(index_prefix.nil? || index_prefix.size==0) ? nil : index_prefix, bundle_name.to_s].compact.join('/')
@@ -489,12 +502,32 @@ module SproutCore
 
       languages.uniq.each { |lang| build_language(lang) }
       
-      # After build is complete, try to copy the index.html file of the preferred language
-      # to the build_root
+      # After build is complete, try to copy the index.html file of the 
+      # preferred language to the build_root
       index_entry = entry_for('index.html', :language => preferred_language)
       if index_entry && File.exists?(index_entry.build_path)
-        FileUtils.mkdir_p(build_root)
-        FileUtils.cp_r(index_entry.build_path, File.join(build_root,'index.html'))
+        
+        # If we are publishing relative resources, then the default
+        # index.html needs to just redirect to the default language.
+        if make_resources_relative
+          index_url = index_entry.url.gsub("#{self.index_root}/",'')
+          file = %(<html><head>
+           <meta http-equiv="refresh" content="0;url=#{index_url}" />
+           <script type="text/javascript">
+            window.location.href='#{index_url}';
+           </script>
+           </head>
+           <body><a href="#{index_url}">Click here</a> if you are not redirected.</body></html>)
+          f = File.open(File.join(build_root, 'index.html'), 'w+')
+          f.write(file)
+          f.close
+          
+        # Otherwise, just copy the contents of the index.html for the 
+        # preferred language.
+        else
+          FileUtils.mkdir_p(build_root)
+          FileUtils.cp_r(index_entry.build_path, File.join(build_root,'index.html'))
+        end
       end
     end
     
@@ -682,7 +715,7 @@ module SproutCore
     # Converts the named path to a fully qualified path name using the library 
     # root, if it does not begin with a slash
     def normalize_path(path)
-      (path[0] == '/'[0]) ? path : File.join(library_root, path)
+      File.expand_path(path, library_root)
     end
 
   end

data/lib/sproutcore/library.rb

@@ -167,9 +167,9 @@ module SproutCore
     end
     
     # Returns the computed environment for a particular client or framework.
-    # This will go up the chain of parent libraries, retrieving and merging any known
-    # environment settings.  The returned options are suitable for passing to the ClientBuilder
-    # for registration.
+    # This will go up the chain of parent libraries, retrieving and merging 
+    # any known environment settings.  The returned options are suitable for 
+    # passing to the ClientBuilder for registration.
     def environment_for(bundle_name)
 
       is_local_client = client_directories.include?(bundle_name.to_s)
@@ -204,8 +204,8 @@ module SproutCore
           ret[key] = all[key] if all.include?(key)
         end
       
-        # Either way, if we have local settings for this specific client, they override whatever
-        # we cooked up just now.
+        # Either way, if we have local settings for this specific client, they 
+        # override whatever we cooked up just now.
         local_settings = environment[bundle_name.to_sym] 
         ret = ret.merge(local_settings) unless local_settings.nil?
 

data/lib/sproutcore/merb/bundle_controller.rb

@@ -93,10 +93,14 @@ module SproutCore
         ret = File.open(build_path)
         
         
-        # In development mode only, immediately delete built composite resources.  We want 
-        # each request to come directly to us.
+        # In development mode only, immediately delete built composite 
+        # resources.  We want each request to come directly to us.
         if (current_bundle.build_mode == :development) && (!entry.cacheable?)
-          FileUtils.rm(build_path)
+          
+          # Deleting composite resources will not work in windows because it
+          # does not like to have files you just open deleted. (Its OK on
+          # windows)
+          FileUtils.rm(build_path) if (RUBY_PLATFORM !~ /mswin32/)
         end
         
         return ret

data/lib/sproutcore/version.rb

@@ -2,7 +2,7 @@ module SproutCore #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 9
+    TINY  = 10
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/{generators → sc_generators}/client/README

@@ -1,3 +1,3 @@
-Your new SproutCore client application has been created.  To access your application, just start sc-sever and visit your client name in the web browser.
+Your new SproutCore client application has been created.  To access your application, just start sc-server and visit your client name in the web browser.
 
 If you want to change the deployment settings for your application edit the sc-config.rb file to get started.

data/{generators → sc_generators}/framework/README

@@ -3,5 +3,5 @@ Your new framework has been created.  To include it in your clients, be sure to
 all:
   requires: [<%= name %>]
 
-Then restart your sc_server and you should be ready to go.
+Then restart your sc-server and you should be ready to go.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Charles Jolley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-05 00:00:00 -07:00
+date: 2008-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -295,38 +295,6 @@ files:
 - frameworks/sproutcore/views/tab.js
 - frameworks/sproutcore/views/toolbar.js
 - frameworks/sproutcore/views/view.js
-- generators/client/client_generator.rb
-- generators/client/README
-- generators/client/templates/core.js
-- generators/client/templates/english.lproj/body.css
-- generators/client/templates/english.lproj/body.rhtml
-- generators/client/templates/english.lproj/strings.js
-- generators/client/templates/main.js
-- generators/client/USAGE
-- generators/controller/controller_generator.rb
-- generators/controller/templates/controller.js
-- generators/controller/templates/test.rhtml
-- generators/controller/USAGE
-- generators/framework/framework_generator.rb
-- generators/framework/README
-- generators/framework/templates/core.js
-- generators/framework/templates/english.lproj/strings.js
-- generators/framework/USAGE
-- generators/language/language_generator.rb
-- generators/language/templates/strings.js
-- generators/language/USAGE
-- generators/model/model_generator.rb
-- generators/model/templates/fixture.js
-- generators/model/templates/model.js
-- generators/model/templates/test.rhtml
-- generators/model/USAGE
-- generators/test/templates/test.rhtml
-- generators/test/test_generator.rb
-- generators/test/USAGE
-- generators/view/templates/test.rhtml
-- generators/view/templates/view.js
-- generators/view/USAGE
-- generators/view/view_generator.rb
 - History.txt
 - jsdoc/app/DocFile.js
 - jsdoc/app/Doclet.js
@@ -379,6 +347,38 @@ files:
 - Rakefile
 - README.txt
 - sc-config.rb
+- sc_generators/client/client_generator.rb
+- sc_generators/client/README
+- sc_generators/client/templates/core.js
+- sc_generators/client/templates/english.lproj/body.css
+- sc_generators/client/templates/english.lproj/body.rhtml
+- sc_generators/client/templates/english.lproj/strings.js
+- sc_generators/client/templates/main.js
+- sc_generators/client/USAGE
+- sc_generators/controller/controller_generator.rb
+- sc_generators/controller/templates/controller.js
+- sc_generators/controller/templates/test.rhtml
+- sc_generators/controller/USAGE
+- sc_generators/framework/framework_generator.rb
+- sc_generators/framework/README
+- sc_generators/framework/templates/core.js
+- sc_generators/framework/templates/english.lproj/strings.js
+- sc_generators/framework/USAGE
+- sc_generators/language/language_generator.rb
+- sc_generators/language/templates/strings.js
+- sc_generators/language/USAGE
+- sc_generators/model/model_generator.rb
+- sc_generators/model/templates/fixture.js
+- sc_generators/model/templates/model.js
+- sc_generators/model/templates/test.rhtml
+- sc_generators/model/USAGE
+- sc_generators/test/templates/test.rhtml
+- sc_generators/test/test_generator.rb
+- sc_generators/test/USAGE
+- sc_generators/view/templates/test.rhtml
+- sc_generators/view/templates/view.js
+- sc_generators/view/USAGE
+- sc_generators/view/view_generator.rb
 - script/destroy
 - script/generate
 - script/txt2html