sproutcore 1.10.0.rc.2 → 1.10.0.rc.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (45) hide show
  1. checksums.yaml +8 -8
  2. data/VERSION.yml +1 -1
  3. data/lib/frameworks/sproutcore/CHANGELOG.md +14 -0
  4. data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/array.js +9 -1
  5. data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane_statechart.js +7 -0
  6. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/array_case.js +14 -0
  7. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layout.js +103 -0
  8. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutChildViews.js +4 -4
  9. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutDidChange.js +4 -1
  10. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/viewDidResize.js +5 -5
  11. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout.js +17 -6
  12. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/statechart.js +62 -8
  13. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js +14 -2
  14. data/lib/frameworks/sproutcore/frameworks/datastore/system/store.js +26 -5
  15. data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/many_array.js +9 -1
  16. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/data_store.js +6 -2
  17. data/lib/frameworks/sproutcore/frameworks/desktop/mixins/split_child.js +1 -1
  18. data/lib/frameworks/sproutcore/frameworks/desktop/panes/picker.js +0 -2
  19. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/render.js +56 -54
  20. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/methods.js +221 -171
  21. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/split/methods.js +261 -315
  22. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/split/split_child.js +137 -122
  23. data/lib/frameworks/sproutcore/frameworks/desktop/views/collection.js +1 -1
  24. data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll.js +10 -7
  25. data/lib/frameworks/sproutcore/frameworks/desktop/views/split.js +5 -4
  26. data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_display.js +14 -14
  27. data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_value_support.js +123 -98
  28. data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/content_display.js +18 -6
  29. data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/api.js +9 -11
  30. data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/transition_test.js +2 -2
  31. data/lib/frameworks/sproutcore/frameworks/foundation/views/container.js +15 -16
  32. data/lib/frameworks/sproutcore/frameworks/foundation/views/inline_text_field.js +11 -0
  33. data/lib/frameworks/sproutcore/frameworks/runtime/mixins/enumerable.js +1 -1
  34. data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js +3 -3
  35. data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/binding.js +170 -153
  36. data/lib/frameworks/sproutcore/frameworks/table/views/table.js +105 -101
  37. data/lib/frameworks/sproutcore/frameworks/table/views/table_head.js +0 -7
  38. data/lib/frameworks/sproutcore/frameworks/table/views/table_header.js +46 -56
  39. data/lib/frameworks/sproutcore/frameworks/table/views/table_row.js +0 -6
  40. data/lib/frameworks/sproutcore/frameworks/template_view/tests/views/template/collection.js +12 -4
  41. data/lib/frameworks/sproutcore/frameworks/template_view/views/bindable_span.js +3 -2
  42. data/lib/frameworks/sproutcore/frameworks/template_view/views/template_collection.js +11 -8
  43. data/lib/frameworks/sproutcore/tests/phantomjs_runner.phantomjs +0 -1
  44. metadata +3 -3
  45. data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/beginEditing.js +0 -235
@@ -4,74 +4,76 @@
4
4
  // portions copyright @2011 Apple Inc.
5
5
  // License: Licensed under MIT license (see license.js)
6
6
  // ==========================================================================
7
+ /*global CoreTest, module, test */
7
8
 
8
- // SC.LOG_BINDINGS = YES ;
9
+ // SC.LOG_BINDINGS = YES;
10
+ // SC.LOG_DEFERRED_CALLS = YES;
9
11
 
10
- var view, content, pane ;
12
+ var view, content, pane;
11
13
 
12
- var renderFunc = CoreTest.stub("render", function() {
13
- SC.ListItemView.prototype.render.apply(this, arguments) ;
14
+ var renderFunc = CoreTest.stub("render", function () {
15
+ SC.ListItemView.prototype.render.apply(this, arguments);
14
16
  });
15
17
 
16
18
  module("SC.ListView.render", {
17
-
18
- setup: function() {
19
- SC.RunLoop.begin();
20
-
21
- content = "1 2 3 4 5 6 7 8 9 10".w().map(function(x) {
22
- return SC.Object.create({ value: x });
23
- });
24
-
25
- view = SC.ListView.create({
26
- content: content,
27
-
28
- layout: { top: 0, left: 0, width: 300, height: 500 },
29
-
30
- layoutForContentIndex: function(idx) {
31
- return { left: 0, right: 0, top: idx * 50, height: 50 };
32
- },
33
-
34
- _cv_nowShowingDidChange: CoreTest.stub("_cv_nowShowingDidChange", function() {
35
- SC.ListView.prototype._cv_nowShowingDidChange.apply(this, arguments) ;
36
- }),
37
-
38
- exampleView: SC.ListItemView.extend({
39
- render: renderFunc
40
- }),
41
-
42
- // reset stubs
43
- reset: function() {
44
- this._cv_nowShowingDidChange.reset();
45
- renderFunc.reset();
46
- }
47
-
19
+
20
+ setup: function () {
21
+ SC.run(function () {
22
+ content = "1 2 3 4 5 6 7 8 9 10".w().map(function (x) {
23
+ return SC.Object.create({ value: x });
24
+ });
25
+
26
+ view = SC.ListView.create({
27
+ content: content,
28
+
29
+ layout: { top: 0, left: 0, width: 300, height: 500 },
30
+
31
+ layoutForContentIndex: function (idx) {
32
+ return { left: 0, right: 0, top: idx * 50, height: 50 };
33
+ },
34
+
35
+ _cv_nowShowingDidChange: CoreTest.stub("_cv_nowShowingDidChange", function () {
36
+ SC.ListView.prototype._cv_nowShowingDidChange.apply(this, arguments);
37
+ }),
38
+
39
+ exampleView: SC.ListItemView.extend({
40
+ render: renderFunc
41
+ }),
42
+
43
+ // reset stubs
44
+ reset: function () {
45
+ this._cv_nowShowingDidChange.reset();
46
+ renderFunc.reset();
47
+ }
48
+
49
+ });
50
+
51
+ pane = SC.Pane.create({
52
+ layout: { width: 200, height: 400 }
53
+ });
54
+ pane.appendChild(view);
55
+ pane.append();
48
56
  });
49
-
50
- pane = SC.MainPane.create();
51
- pane.appendChild(view);
52
- pane.append();
53
-
54
- SC.RunLoop.end();
55
57
  },
56
-
57
- teardown: function() {
58
- SC.RunLoop.begin();
59
- view.reset();
60
- pane.remove();
61
- pane.destroy();
62
- SC.RunLoop.end();
58
+
59
+ teardown: function () {
60
+ SC.run(function () {
61
+ view.reset();
62
+ pane.remove();
63
+ pane.destroy();
64
+ });
63
65
  }
64
-
66
+
65
67
  });
66
68
 
67
69
  // ..........................................................
68
70
  // BASIC TESTS
69
- //
71
+ //
70
72
 
71
- test("list item render() should only be called once per item view a static content array", function() {
73
+ test("list item render() should only be called once per item view a static content array", function () {
72
74
  renderFunc.expect(10);
73
75
  });
74
76
 
75
- // test("_cv_nowShowingDidChange() should only be called once with a static content array", function() {
76
- // view._cv_nowShowingDidChange.expect(1); // currently is 3...
77
- // });
77
+ test("_cv_nowShowingDidChange() should only be called once with a static content array", function () {
78
+ view._cv_nowShowingDidChange.expect(3); // currently is 3... could it be once?
79
+ });