sproutcore 1.5.0.pre.4.1 → 1.5.0.pre.5

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

@@ -490,14 +490,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
@@ -506,7 +506,7 @@ 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)) ;
       }
     }
 

data/lib/frameworks/sproutcore/frameworks/desktop/tests/mixins/border.js

@@ -11,6 +11,11 @@ var pane;
 
 module("SC.Border", {
   setup: function() {
+    var boxstyles = '<style>.box1-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }'+
+                    '.box2-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }'+
+                    '.box3-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }</style>';
+    htmlbody(boxstyles);
+
     SC.RunLoop.begin();
     pane = SC.MainPane.create();
     pane.append();
@@ -20,14 +25,10 @@ module("SC.Border", {
   teardown: function() {
     pane.remove();
     pane = null;
+    clearHtmlbody();
   }
 });
 
-var boxstyles = '<style>.box1-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }'+
-                '.box2-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }'+
-                '.box3-border { border-top: 10px solid red; border-left: 25px solid red; border-right: 109px solid green; border-bottom: 79px solid red; }</style>';
-htmlbody(boxstyles);
-
 test('SC.View should not have border properties by default', function() {
   var view = SC.View.create();
   ok(!view.get('hasBorder'), 'view should not have hasBorder set');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/ui.js

@@ -7,9 +7,15 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-module("SC.PickerPane UI");
+module("SC.PickerPane UI", {
+  setup: function(){
+    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+  },
+  teardown: function(){
+    clearHtmlbody();
+  }
+};
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 
 function evaluatePicker(pane) {
   ok(pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/select_button/ui.js

@@ -7,7 +7,6 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 
 //control test pane
 var pane = SC.ControlTestPane.design()
@@ -91,7 +90,16 @@ var pane = SC.ControlTestPane.design()
 // TEST VIEWS
 //
 
-module('SC.SelectButtonView ui', pane.standardSetup()) ;
+module('SC.SelectButtonView ui', {
+  setup: function(){
+    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+    pane.standardSetup().setup();
+  },
+  teardown: function(){
+    pane.standardSetup().teardown();
+    clearHtmlbody();
+  }
+});
 
 //test1
 test("Check the visiblity of the selectButtons", function() {

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/ui.js

@@ -7,7 +7,6 @@
 
 /*global module test htmlbody ok equals same */
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 
   var iconURL= "http://www.freeiconsweb.com/Icons/16x16_people_icons/People_046.gif";
 (function() {
@@ -72,7 +71,14 @@ var pane = SC.ControlTestPane.design({height:24})
 
 pane.show(); // add a test to show the test pane
 
-module('SC.ButtonView ui');
+module('SC.ButtonView ui', {
+  setup: function(){
+    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+  },
+  teardown: function(){
+    clearHtmlbody();
+  }
+};
 
 test("Check that all button are visible", function() {
   ok(pane.view('basic').get('isVisibleInWindow'), 'basic.isVisibleInWindow should be YES');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/checkbox/ui.js

@@ -7,7 +7,6 @@
 
 /*global module test htmlbody ok equals same */
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 (function() {
 var pane = SC.ControlTestPane.design()
   .add("basic", SC.CheckboxView, { 
@@ -53,7 +52,16 @@ pane.show(); // add a test to show the test pane
 // ..........................................................
 // TEST VIEWS
 // 
-module('SC.CheckboxView ui', pane.standardSetup());
+module('SC.CheckboxView ui', {
+  setup: function(){
+    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+    pane.standardSetup().setup();
+  },
+  teardown: function(){
+    pane.standardSetup().teardown();
+    clearHtmlbody();
+  }
+});
 
 test("basic", function() {
   var view = pane.view('basic');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/ui_diagram.js

@@ -7,13 +7,6 @@
 
 /* Test SC.StackedView with a Comments example. */
 
-htmlbody(["<style>",
-  '.sc-collection-view { border: 1px black solid; background-color: white; }',
-  '.shape.sel { background-color: #f55; color: white; }',
-  '.shape { background-color: #ddd; border: 1px black solid; color: black; box-shadow: 3px 3px 5px #888; }',
-  '.shape label { position: absolute; left: 0; right: 0; height: 12px; margin-top: -6px; top: 50%; font-size: 11px; text-align: center; }',
-'</style>'].join("\n"));
-
 var ShapeView = SC.View.extend(SC.Control, {
   
   content: null,
@@ -166,8 +159,21 @@ window.pane = pane ;
 // ..........................................................
 // BASIC TESTS
 // 
-module("Basic Tests", pane.standardSetup());
-
+module("Basic Tests", {
+  setup: function(){
+    htmlbody(["<style>",
+      '.sc-collection-view { border: 1px black solid; background-color: white; }',
+      '.shape.sel { background-color: #f55; color: white; }',
+      '.shape { background-color: #ddd; border: 1px black solid; color: black; box-shadow: 3px 3px 5px #888; }',
+      '.shape label { position: absolute; left: 0; right: 0; height: 12px; margin-top: -6px; top: 50%; font-size: 11px; text-align: center; }',
+    '</style>'].join("\n"));
+    pane.standardSetup().setup();
+  },
+  teardown: function(){
+    pane.standardSetup().teardown();
+    clearHtmlbody();
+  }
+});
 
 
 // ..........................................................

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/progress/ui.js

@@ -7,7 +7,6 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 (function() {
 var pane = SC.ControlTestPane.design()
 
@@ -149,7 +148,14 @@ pane.show(); // add a test to show the test pane
 // ..........................................................
 // TEST VIEWS
 // 
-module("SC.ProgressView UI");
+module("SC.ProgressView UI", {
+  setup: function(){
+    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+  },
+  teardown: function(){
+    clearHtmlbody();
+  }
+};
 
 test("basic", function() {
   

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/radio/ui.js

@@ -7,7 +7,6 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 
 var itemList = [{ title: "Red", value: "red", enabled: YES,ariaLabeledBy: "color" }, { title: "Green", value: "green",ariaLabeledBy: "color"  }, { title: "Blue", value: "blue",ariaLabeledBy: "color" }],
 itemList2 = [{ title: "Cyan", value: "cyan", enabled: YES,ariaLabel: "itemList1" }, { title: "Magenta", value: "magenta",ariaLabel: "itemList1"  }, { title: "Yellow", value: "yellow",ariaLabel: "itemList1"  },{ title: "blacK", value: "black",ariaLabel: "itemList1" }],
@@ -141,7 +140,14 @@ pane.verifyLabels = function verifyLabels(view, items) {
 // ..........................................................
 // TEST VIEWS
 // 
-module('SC.RadioView UI');
+module('SC.RadioView UI', {
+  setup: function(){
+    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+  },
+  teardown: function(){
+    clearHtmlbody();
+  }
+};
 
 test("basic", function() {
   

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/ui.js

@@ -8,7 +8,6 @@
 /*global module test htmlbody ok equals same stop start */
 
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 var pane;
 (function() {
   var iconURL= "http://www.freeiconsweb.com/Icons/16x16_people_icons/People_046.gif";
@@ -181,7 +180,16 @@ var pane;
   // ..........................................................
   // TEST VIEWS
   //
-  module('SC.SegmentedView ui', pane.standardSetup());
+  module('SC.SegmentedView ui', {
+    setup: function(){
+      htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+      pane.standardSetup().setup();
+    },
+    teardown: function(){
+      pane.standardSetup().teardown();
+      clearHtmlbody();
+    }
+  });
 
   test("Check that all segmentedViews are visible", function() {
     ok(pane.view('3_empty').get('isVisibleInWindow'), '3_empty.isVisibleInWindow should be YES');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select/ui.js

@@ -7,7 +7,6 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
 
 //control test pane
 var pane = SC.ControlTestPane.design()
@@ -92,7 +91,16 @@ var pane = SC.ControlTestPane.design()
 // TEST VIEWS
 //
 
-module('SC.SelectView ui', pane.standardSetup()) ;
+module('SC.SelectView ui', {
+  setup: function(){
+    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+    pane.standardSetup().setup();
+  },
+  teardown: function(){
+    pane.standardSetup().teardown();
+    clearHtmlbody();
+  }
+});
 
 //test1
 test("Check the visiblity of the selectButtons", function() {

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/methods.js

@@ -129,4 +129,35 @@ test("selectedValue shouldn't have st string attached to it", function() {
   
 });
 
+test("changing the selected item in the select field appropriately notifies that the value has changed", function() {
+  SC.RunLoop.begin();
+  var newObjects2 =[{pos: 1,title:'US/Pacific'}, 
+  {pos: 2, title:'America/Vancouver'}, 
+  {pos: 3, title:'Canada/Mountain'},
+  {pos: 4, title:'Other...'}], elm;
+  pane.set('objs', newObjects2);
+  SC.RunLoop.end();  
+  SC.RunLoop.begin();
+  pane.set('selectedValue', 'America/Vancouver');
+  SC.RunLoop.end();  
+  selectedValue = view3.getFieldValue() ;
+  equals(selectedValue,'America/Vancouver', 'the new Value is ');
+  
+  
+  // Changing the selection in the box to 'Canada/Mountain' programmatically
+  SC.RunLoop.begin();
+  elm = view3.$input().get(0);
+  elm.childNodes[2].selected = true;
+  SC.RunLoop.end();
+  
+  // Trigger observer!
+  SC.RunLoop.begin();
+  SC.Event.trigger(elm, "change");
+  SC.RunLoop.end();
 
+  // See if the value propagated to the controller.
+  SC.RunLoop.begin();
+  selectedValue = pane.get('selectedValue') ;
+  SC.RunLoop.end();  
+  equals(selectedValue,'Canada/Mountain', 'the bound Value is ');
+});

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/ui.js

@@ -7,8 +7,6 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
-
 var pane = SC.ControlTestPane.design()
     .add("basic", SC.SelectFieldView, { 
        objects:["1","2","3","4","5"]
@@ -56,7 +54,16 @@ var pane = SC.ControlTestPane.design()
 // TEST VIEWS
 // 
 
-module('SC.SelectFieldView ui', pane.standardSetup());
+module('SC.SelectFieldView ui', {
+  setup: function(){
+    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+    pane.standardSetup().setup();
+  },
+  teardown: function(){
+    pane.standardSetup().teardown();
+    clearHtmlbody();
+  }
+});
 
 test("basic", function() {
   var view = pane.view('basic');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/separator.js

@@ -7,8 +7,6 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
-
 (function() {
   var pane = SC.ControlTestPane.design()
   .add("horizontal", SC.SeparatorView, { 
@@ -19,7 +17,16 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
   });   
   pane.show(); 
 
-module("TODO: Test SC.Separator UI", pane.standardSetup());
+module("TODO: Test SC.Separator UI", {
+  setup: function(){
+    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+    pane.standardSetup().setup();
+  },
+  teardown: function(){
+    pane.standardSetup().teardown();
+    clearHtmlbody();
+  }
+});
 
   test("basic", function() {
     var view = pane.view('horizontal');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/split/ui.js

@@ -7,8 +7,6 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
-
 (function() {
   var pane = SC.ControlTestPane.design()
     .add("horizontal", SC.SplitView, { 
@@ -28,7 +26,16 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
   // ..........................................................
   // TEST VIEWS
   // 
-  module('SC.SplitView ui', pane.standardSetup());
+  module('SC.SplitView ui', {
+    setup: function(){
+      htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+      pane.standardSetup().setup();
+    },
+    teardown: function(){
+      pane.standardSetup().teardown();
+      clearHtmlbody();
+    }
+  });
 
   test("Horizontal and Vertical SplitView", function() {
   	var view = pane.view('horizontal');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/stacked/ui_comments.js

@@ -7,13 +7,6 @@
 
 /* Test SC.StackedView with a Comments example. */
 
-htmlbody(["<style>",
-  '.sc-stacked-view { border-bottom: 1px red solid; }',
-  '.comment-view.sel { background-color: #ccc; }',
-  '.comment-view { margin: 0 10px; padding: 10px 0; border-bottom: 1px #ccc solid; }',
-  '.comment-view p { padding-top: 28px; padding-bottom: 32px; }',
-'</style>'].join("\n"));
-
 var CommentView = SC.View.extend(SC.StaticLayout, SC.Control, {
   
   useStaticLayout: YES,
@@ -128,7 +121,21 @@ window.pane = pane ;
 // ..........................................................
 // BASIC TESTS
 // 
-module("Basic Tests", pane.standardSetup());
+module("Basic Tests", {
+  setup: function(){
+    htmlbody(["<style>",
+      '.sc-stacked-view { border-bottom: 1px red solid; }',
+      '.comment-view.sel { background-color: #ccc; }',
+      '.comment-view { margin: 0 10px; padding: 10px 0; border-bottom: 1px #ccc solid; }',
+      '.comment-view p { padding-top: 28px; padding-bottom: 32px; }',
+    '</style>'].join("\n"));
+    pane.standardSetup().setup();
+  },
+  teardown: function(){
+    pane.standardSetup().teardown();
+    clearHtmlbody();
+  }
+});
 
 test("removing an item should delete childView and adjust height", function() {
   var view = pane.view('basic'),