sproutcore 1.0.1030 → 1.0.1031

data/VERSION.yml

@@ -1,7 +1,7 @@
 --- 
-:patch: 1030
-:digest: 08480f0db0e56c32ce2c6a328444980a5010ccaf
+:patch: 1031
+:digest: a4a6ad7402d09a2424b632097d189cbe5249461e
 :dist: 
-  frameworks/sproutcore: f9f7fe42cbb165a4021eeb616c6990914b83079d
+  frameworks/sproutcore: 8c54dc5a319e402e86319e5a98c21d16744200d8
 :major: 1
 :minor: 0

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

@@ -187,7 +187,7 @@ SC.RootResponder = SC.Object.extend({
     // Otherwise, make the main pane the key pane (if it accepts it).
     if (!newKeyPane) {
       var mainPane = this.get('mainPane') ;
-      if (mainPane.get('acceptsKeyPane')) newKeyPane = mainPane ;
+      if (mainPane && mainPane.get('acceptsKeyPane')) newKeyPane = mainPane ;
     }
     
     // now notify old and new key views of change after edit    

data/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/methods.js

@@ -11,44 +11,55 @@
 // note: need to test interaction with Validators here
 // possibly move Validator support to TextFieldView specifically.
 
-var pane, view, view1;
+var pane, view, view1, view2;
+
 module("SC.TextFieldView",{
-	setup: function() {
-	    SC.RunLoop.begin();
-	    pane = SC.MainPane.create({
-		  childViews: [
-		   SC.TextFieldView.extend({
-			hint:'First Name',
-			value:'',
-			title:'First Name'
-		   }),
-		   SC.TextFieldView.extend({
-			hint:'Name',
-			value:'SproutCore',
-			isEnabled: NO
-		   })]	
-		});
-		pane.append(); // make sure there is a layer...
-	    SC.RunLoop.end();
-	
-		view = pane.childViews[0];
-		view1= pane.childViews[1];
-	},
-	
-	teardown: function() {
-    	pane.remove();
-    	pane = view = null ;
-  	}		
+  setup: function() {
+      SC.RunLoop.begin();
+      pane = SC.MainPane.create({
+        childViews: [
+          SC.TextFieldView.extend({
+            hint:'First Name',
+            value:'',
+            title:'First Name'
+          }),
+          SC.TextFieldView.extend({
+            hint:'Name',
+            value:'SproutCore',
+            isEnabled: NO
+          }),
+          SC.TextFieldView.extend({
+            layerId: 'fieldWithCustomId'
+          })
+        ]
+    });
+    pane.append(); // make sure there is a layer...
+    SC.RunLoop.end();
+    
+    view  = pane.childViews[0];
+    view1 = pane.childViews[1];
+    view2 = pane.childViews[2];
+  },
+  
+  teardown: function() {
+      pane.remove();
+      pane = view = null ;
+    }    
 });
 
 test("renders an text field input tag with appropriate attributes", function() {
   equals(view.get('value'), '', 'value should be empty');
   equals(view1.get('value'), 'SproutCore', 'value should not be empty ');
-  equals(view.get('isEnabled'),YES,'field enabled' );	
+  equals(view.get('isEnabled'),YES,'field enabled' );
   equals(view1.get('isEnabled'),NO,'field not enabled' );
   var q = Q$('input', view.get('layer'));
   equals(q.attr('type'), 'text', 'should have type as text');
-  equals(q.attr('name'), SC.guidFor(view), 'should have name as view_guid');
+  equals(q.attr('name'), view.get('layerId'), 'should have name as view_layerid');
+});
+
+test("renders an text field with a custom layerId with correct id and name html attributes", function() {  
+  equals(view2.$().attr('id'), 'fieldWithCustomId', 'label html element should have the custom id');
+  equals(view2.$input().attr('name'), 'fieldWithCustomId', 'input html element should have the custom name');
 });
 
 test("isEnabled=NO should add disabled class", function() {
@@ -69,8 +80,8 @@ test("isEnabled=NO should add disabled class", function() {
 
 test("isEnabled and isEditable mapping", function() {
   var obj= SC.TextFieldView.create();
-	obj.set('isEnabled',false);
-	equals(obj.get('isEditable'),false);
-	obj.set('isEnabled',true);
-	equals(obj.get('isEditable'),true);
+  obj.set('isEnabled',false);
+  equals(obj.get('isEditable'),false);
+  obj.set('isEnabled',true);
+  equals(obj.get('isEditable'),true);
 });

data/frameworks/sproutcore/frameworks/foundation/views/text_field.js

@@ -362,7 +362,7 @@ SC.TextFieldView = SC.FieldView.extend(SC.StaticLayout, SC.Editable,
     if (firstTime || this._forceRenderFirstTime) {
       this._forceRenderFirstTime = NO;
       var disabled = this.get('isEnabled') ? '' : 'disabled="disabled"' ;
-      var name = SC.guidFor(this) ;
+      var name = this.get('layerId');
       
       context.push('<span class="border"></span>');
 

data/lib/sproutcore/models/manifest.rb

@@ -277,7 +277,10 @@ module SC
         manifest = self
         filename = target_name
       else
-        manifest = target.target_for(target_name).manifest_for(self.variation)
+        if (_manifest_target = target.target_for(target_name)).nil?
+          throw "Cannot file target #{target_name} for entry #{filename}"
+        end
+        manifest = _manifest_target.manifest_for(self.variation)
         manifest.build!
       end
       

data/lib/sproutcore/tools.rb

@@ -338,6 +338,7 @@ module SC
           if is_verbose && !e.kind_of?(FatalException)
             SC.logger.fatal("BACKTRACE:\n#{e.backtrace.join("\n")}\n")
           end
+          exit(1) 
         end
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 1.0.1030
+  version: 1.0.1031
 platform: ruby
 authors: 
 - Sprout Systems, Inc.  Apple Inc. and contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 -08:00
+date: 2009-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency