sproutcore 1.10.3.1 → 1.11.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (380) hide show
  1. checksums.yaml +8 -8
  2. data/CHANGELOG +4 -8
  3. data/VERSION.yml +2 -2
  4. data/lib/frameworks/sproutcore/Buildfile +5 -4
  5. data/lib/frameworks/sproutcore/CHANGELOG.md +274 -40
  6. data/lib/frameworks/sproutcore/CONTRIBUTORS.md +133 -0
  7. data/lib/frameworks/sproutcore/README.md +31 -144
  8. data/lib/frameworks/sproutcore/apps/showcase/controllers/source_tree_controller.js +9 -4
  9. data/lib/frameworks/sproutcore/apps/showcase/resources/stylesheet.css +5 -0
  10. data/lib/frameworks/sproutcore/apps/showcase/system/views_item_content.js +1 -1
  11. data/lib/frameworks/sproutcore/apps/showcase/views/split_views.js +15 -2
  12. data/lib/frameworks/sproutcore/apps/showcase/views/stacked_views.js +1 -1
  13. data/lib/frameworks/sproutcore/apps/tests/english.lproj/main_page.js +11 -1
  14. data/lib/frameworks/sproutcore/frameworks/ajax/mixins/websocket_delegate.js +90 -0
  15. data/lib/frameworks/sproutcore/frameworks/ajax/system/request.js +81 -5
  16. data/lib/frameworks/sproutcore/frameworks/ajax/system/response.js +23 -4
  17. data/lib/frameworks/sproutcore/frameworks/ajax/system/websocket.js +475 -0
  18. data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/request.js +149 -26
  19. data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/websocket.js +197 -0
  20. data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/xhr_response_test.js +65 -0
  21. data/lib/frameworks/sproutcore/frameworks/bootstrap/system/loader.js +4 -0
  22. data/lib/frameworks/sproutcore/frameworks/core_foundation/child_view_layouts/horizontal_stack_layout.js +232 -52
  23. data/lib/frameworks/sproutcore/frameworks/core_foundation/child_view_layouts/vertical_stack_layout.js +235 -49
  24. data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/array.js +23 -13
  25. data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/object.js +3 -1
  26. data/lib/frameworks/sproutcore/frameworks/core_foundation/core.js +81 -1
  27. data/lib/frameworks/sproutcore/frameworks/core_foundation/english.lproj/ordinal.js +17 -0
  28. data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/string.js +7 -0
  29. data/lib/frameworks/sproutcore/frameworks/{desktop/tests/views/disclosure/methods.js → core_foundation/french.lproj/ordinal.js} +7 -4
  30. data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/layout.js +2 -6
  31. data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/main.js +1 -1
  32. data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane.js +104 -69
  33. data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane_statechart.js +6 -1
  34. data/lib/frameworks/sproutcore/frameworks/core_foundation/protocols/child_view_layout_protocol.js +59 -0
  35. data/lib/frameworks/sproutcore/frameworks/core_foundation/protocols/view_transition_protocol.js +18 -1
  36. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/application.js +192 -0
  37. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/bezier_curves.js +52 -0
  38. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/color.js +384 -64
  39. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/core_query.js +6 -14
  40. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/device.js +21 -35
  41. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/event.js +72 -36
  42. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/locale.js +90 -34
  43. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/platform.js +55 -7
  44. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/render_context.js +20 -15
  45. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/req_anim_frame.js +9 -10
  46. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/root_responder.js +763 -542
  47. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/selection_set.js +4 -3
  48. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/sparse_array.js +1 -7
  49. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/string.js +14 -0
  50. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/touch.js +538 -0
  51. data/lib/frameworks/sproutcore/frameworks/core_foundation/system/utils/rect.js +56 -1
  52. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/array_case.js +99 -4
  53. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/single_case.js +25 -19
  54. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/core_tests.js +75 -0
  55. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/ext/number_test.js +81 -0
  56. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/action_support.js +4 -4
  57. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/responder_context.js +4 -4
  58. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/string.js +19 -1
  59. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/color.js +36 -20
  60. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/design_modes_test.js +83 -0
  61. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/makeMainPane.js +7 -3
  62. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/mouse_events.js +338 -0
  63. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/root_responder.js +14 -89
  64. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/touch.js +106 -0
  65. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/sparse_array.js +2 -2
  66. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/touch.js +136 -0
  67. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/utils/rect.js +42 -1
  68. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/append_remove.js +11 -0
  69. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/child_view.js +5 -5
  70. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/design_mode_test.js +457 -0
  71. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/sendEvent.js +36 -10
  72. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/background_color.js +44 -0
  73. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/border_frame_test.js +51 -24
  74. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/childViewLayout_test.js +176 -1
  75. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/clippingFrame.js +46 -16
  76. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/convertFrames.js +69 -15
  77. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/didAppendToDocument.js +2 -2
  78. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layout.js +7 -1
  79. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutDidChange.js +30 -10
  80. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutStyle.js +376 -71
  81. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/static_layout.js +0 -10
  82. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/viewDidResize.js +117 -34
  83. data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/view_states_test.js +52 -2
  84. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js +656 -42
  85. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/animation.js +159 -38
  86. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/cursor.js +0 -7
  87. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/design_mode.js +206 -0
  88. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/enabled.js +0 -28
  89. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/keyboard.js +21 -6
  90. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout.js +372 -450
  91. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout_style.js +28 -13
  92. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/manipulation.js +22 -51
  93. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/statechart.js +59 -30
  94. data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/theming.js +0 -29
  95. data/lib/frameworks/sproutcore/frameworks/datastore/mixins/relationship_support.js +22 -10
  96. data/lib/frameworks/sproutcore/frameworks/datastore/models/children_attribute.js +42 -36
  97. data/lib/frameworks/sproutcore/frameworks/datastore/models/many_attribute.js +54 -3
  98. data/lib/frameworks/sproutcore/frameworks/datastore/models/record.js +178 -59
  99. data/lib/frameworks/sproutcore/frameworks/datastore/models/record_attribute.js +2 -2
  100. data/lib/frameworks/sproutcore/frameworks/datastore/system/child_array.js +206 -132
  101. data/lib/frameworks/sproutcore/frameworks/datastore/system/many_array.js +214 -118
  102. data/lib/frameworks/sproutcore/frameworks/datastore/system/nested_store.js +96 -13
  103. data/lib/frameworks/sproutcore/frameworks/datastore/system/query.js +14 -4
  104. data/lib/frameworks/sproutcore/frameworks/datastore/system/record_array.js +82 -42
  105. data/lib/frameworks/sproutcore/frameworks/datastore/system/store.js +272 -177
  106. data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/store_interaction_test.js +54 -0
  107. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/datetime_recordattribute.js +24 -16
  108. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/many_attribute.js +6 -3
  109. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/data_store.js +267 -35
  110. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record.js +57 -46
  111. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array.js +150 -53
  112. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array_complex.js +57 -17
  113. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_complex.js +13 -9
  114. data/lib/frameworks/sproutcore/frameworks/{experimental/frameworks/polymorphism → datastore}/tests/models/polymorphism/many.js +2 -2
  115. data/lib/frameworks/sproutcore/frameworks/{experimental/frameworks/polymorphism → datastore}/tests/models/polymorphism/simple.js +0 -0
  116. data/lib/frameworks/sproutcore/frameworks/{experimental/frameworks/polymorphism → datastore}/tests/models/polymorphism/single.js +12 -2
  117. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/writeAttribute.js +20 -15
  118. data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record_attribute.js +9 -2
  119. data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/many_array/core_methods.js +80 -14
  120. data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/autonomous_dataSourceCallbacks.js +280 -0
  121. data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/autonomous_pushChanges.js +232 -0
  122. data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/chain.js +31 -5
  123. data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/parse.js +16 -2
  124. data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/core_methods.js +60 -40
  125. data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/materializeRecord.js +78 -0
  126. data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/system/datetime.js +13 -1
  127. data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/tests/system/datetime.js +20 -0
  128. data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/{resources → english.lproj}/strings.js +0 -0
  129. data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/french.lproj/strings.js +45 -0
  130. data/lib/frameworks/sproutcore/frameworks/designer/designers/object_designer.js +7 -3
  131. data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_row_delegate.js +125 -44
  132. data/lib/frameworks/sproutcore/frameworks/desktop/panes/alert.js +139 -48
  133. data/lib/frameworks/sproutcore/frameworks/desktop/panes/draggable.js +202 -0
  134. data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js +59 -56
  135. data/lib/frameworks/sproutcore/frameworks/desktop/panes/palette.js +13 -49
  136. data/lib/frameworks/sproutcore/frameworks/desktop/panes/picker.js +466 -305
  137. data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drag_source.js +49 -12
  138. data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/slider.js +79 -21
  139. data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/split.js +12 -2
  140. data/lib/frameworks/sproutcore/frameworks/desktop/resources/menu_item_view.css +8 -0
  141. data/lib/frameworks/sproutcore/frameworks/desktop/resources/overlay-scroller.css +187 -0
  142. data/lib/frameworks/sproutcore/frameworks/desktop/system/drag.js +94 -30
  143. data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/ui.js +163 -3
  144. data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/menu/methods.js +97 -78
  145. data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/menu/ui.js +61 -1
  146. data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/methods.js +7 -3
  147. data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/ui.js +47 -22
  148. data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/methods.js +66 -9
  149. data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/ui.js +21 -11
  150. data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/sheet/ui.js +12 -18
  151. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/methods.js +17 -14
  152. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/ui.js +2 -1
  153. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/checkbox/methods.js +9 -6
  154. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/collection_fast_path.js +54 -21
  155. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/content.js +52 -20
  156. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/itemViewForContentIndex.js +94 -4
  157. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/keyboard.js +177 -0
  158. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/layerIdFor.js +13 -1
  159. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/length.js +9 -9
  160. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/mouse.js +18 -0
  161. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/date_field/methods.js +104 -0
  162. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/disclosure/ui.js +48 -49
  163. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/grid/drag_and_drop.js +22 -18
  164. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/grid/methods.js +17 -5
  165. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/link_view_test.js +136 -0
  166. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/contentIndexesInRect.js +77 -0
  167. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/drag_and_drop.js +53 -16
  168. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/layoutForContentIndex.js +41 -0
  169. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowDelegate.js +25 -25
  170. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowOffsetForContentIndex.js +102 -27
  171. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/{rowHeightForContentIndex.js → rowSizeForContentIndex.js} +7 -6
  172. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_outline.js +2 -0
  173. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_row_heights.js +70 -75
  174. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_simple.js +29 -30
  175. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list_item.js +57 -0
  176. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/menu_scroll_view/menu_scroll_view_test.js +206 -0
  177. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/progress/ui.js +15 -0
  178. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/radio/methods.js +15 -7
  179. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/integration.js +16 -11
  180. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/methods.js +164 -12
  181. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/scale.js +387 -0
  182. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/touch.js +549 -0
  183. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/ui.js +214 -45
  184. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroller.js +5 -5
  185. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/methods.js +73 -22
  186. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/ui.js +88 -3
  187. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select/methods.js +8 -0
  188. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/slider/methods.js +16 -1
  189. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/slider/ui.js +54 -0
  190. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/split/dividers.js +21 -2
  191. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/static_content.js +31 -25
  192. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/methods.js +109 -29
  193. data/lib/frameworks/sproutcore/frameworks/desktop/views/button.js +10 -1
  194. data/lib/frameworks/sproutcore/frameworks/desktop/views/checkbox.js +3 -0
  195. data/lib/frameworks/sproutcore/frameworks/desktop/views/collection.js +779 -603
  196. data/lib/frameworks/sproutcore/frameworks/desktop/views/date_field.js +106 -7
  197. data/lib/frameworks/sproutcore/frameworks/desktop/views/link_view.js +406 -0
  198. data/lib/frameworks/sproutcore/frameworks/desktop/views/list.js +437 -245
  199. data/lib/frameworks/sproutcore/frameworks/desktop/views/list_item.js +13 -0
  200. data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_item.js +124 -62
  201. data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_scroll.js +176 -597
  202. data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_scroller_view.js +206 -0
  203. data/lib/frameworks/sproutcore/frameworks/desktop/views/popup_button.js +3 -0
  204. data/lib/frameworks/sproutcore/frameworks/desktop/views/progress.js +5 -4
  205. data/lib/frameworks/sproutcore/frameworks/desktop/views/radio.js +3 -0
  206. data/lib/frameworks/sproutcore/frameworks/desktop/views/scene.js +56 -158
  207. data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll_view.js +2560 -0
  208. data/lib/frameworks/sproutcore/frameworks/desktop/views/scroller.js +458 -242
  209. data/lib/frameworks/sproutcore/frameworks/desktop/views/segmented.js +117 -54
  210. data/lib/frameworks/sproutcore/frameworks/desktop/views/select.js +18 -12
  211. data/lib/frameworks/sproutcore/frameworks/desktop/views/slider.js +162 -34
  212. data/lib/frameworks/sproutcore/frameworks/desktop/views/split.js +30 -15
  213. data/lib/frameworks/sproutcore/frameworks/desktop/views/split_divider.js +33 -7
  214. data/lib/frameworks/sproutcore/frameworks/desktop/views/static_content.js +22 -2
  215. data/lib/frameworks/sproutcore/frameworks/desktop/views/tab.js +47 -22
  216. data/lib/frameworks/sproutcore/frameworks/experimental/Buildfile +0 -6
  217. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form.js +2 -1
  218. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form_row.js +21 -21
  219. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/ext/menu.js +14 -3
  220. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/mixins/select_view_menu.js +24 -10
  221. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/ext/menu_resizing.js +1 -1
  222. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/mixins/select_view_menu/bindings.js +7 -4
  223. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/mixins/select_view_menu/check_selected.js +7 -9
  224. data/lib/frameworks/sproutcore/frameworks/{desktop/tests/panes/select_button/methods.js → experimental/frameworks/select_view/tests/views/select/method.js} +54 -76
  225. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/select/selected_item.js +35 -0
  226. data/lib/frameworks/sproutcore/frameworks/{desktop/tests/panes/select_button → experimental/frameworks/select_view/tests/views/select}/ui.js +107 -36
  227. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/views/select.js +225 -66
  228. data/lib/frameworks/sproutcore/frameworks/foundation/controllers/tree.js +39 -38
  229. data/lib/frameworks/sproutcore/frameworks/foundation/core.js +5 -18
  230. data/lib/frameworks/sproutcore/frameworks/foundation/debug/control_test_pane.js +12 -0
  231. data/lib/frameworks/sproutcore/frameworks/foundation/english.lproj/inflections.js +84 -0
  232. data/lib/frameworks/sproutcore/frameworks/foundation/french.lproj/inflections.js +41 -0
  233. data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_mixin.js +1 -0
  234. data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_resize.js +7 -0
  235. data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_display.js +3 -4
  236. data/lib/frameworks/sproutcore/frameworks/foundation/mixins/flowed_layout.js +6 -2
  237. data/lib/frameworks/sproutcore/frameworks/foundation/private/tree_item_observer.js +408 -239
  238. data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/canvas_image.js +1 -1
  239. data/lib/frameworks/sproutcore/frameworks/foundation/resources/text_field.css +2 -1
  240. data/lib/frameworks/sproutcore/frameworks/foundation/spanish.lproj/inflections.js +38 -0
  241. data/lib/frameworks/sproutcore/frameworks/foundation/system/benchmark.js +104 -76
  242. data/lib/frameworks/sproutcore/frameworks/foundation/system/string.js +20 -94
  243. data/lib/frameworks/sproutcore/frameworks/foundation/system/text_selection.js +33 -22
  244. data/lib/frameworks/sproutcore/frameworks/foundation/system/undo_manager.js +475 -0
  245. data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/auto_resize_test.js +163 -1
  246. data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/flowed_layout/tests.js +41 -0
  247. data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/staticLayout.js +2 -5
  248. data/lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/methods.js +268 -0
  249. data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/undo_manager.js +231 -0
  250. data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/ui.js +16 -0
  251. data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/image/ui.js +27 -0
  252. data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/methods.js +24 -0
  253. data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/ui.js +135 -6
  254. data/lib/frameworks/sproutcore/frameworks/foundation/transitions/fade_transition.js +6 -0
  255. data/lib/frameworks/sproutcore/frameworks/foundation/transitions/pop_transition.js +7 -0
  256. data/lib/frameworks/sproutcore/frameworks/foundation/transitions/scale_transition.js +6 -0
  257. data/lib/frameworks/sproutcore/frameworks/foundation/transitions/slide_transition.js +4 -0
  258. data/lib/frameworks/sproutcore/frameworks/foundation/transitions/swap_dissolve_transition.js +3 -1
  259. data/lib/frameworks/sproutcore/frameworks/foundation/validators/credit_card.js +21 -21
  260. data/lib/frameworks/sproutcore/frameworks/foundation/views/container.js +65 -15
  261. data/lib/frameworks/sproutcore/frameworks/foundation/views/image.js +4 -1
  262. data/lib/frameworks/sproutcore/frameworks/foundation/views/label.js +1 -1
  263. data/lib/frameworks/sproutcore/frameworks/foundation/views/text_field.js +193 -213
  264. data/lib/frameworks/sproutcore/frameworks/jquery/{jquery-1.8.3-patched.js → jquery-1.11.1.js} +7507 -6684
  265. data/lib/frameworks/sproutcore/frameworks/routing/system/routes.js +28 -11
  266. data/lib/frameworks/sproutcore/frameworks/routing/tests/system/routes.js +26 -0
  267. data/lib/frameworks/sproutcore/frameworks/runtime/core.js +54 -25
  268. data/lib/frameworks/sproutcore/frameworks/runtime/ext/array.js +0 -6
  269. data/lib/frameworks/sproutcore/frameworks/runtime/ext/number.js +36 -0
  270. data/lib/frameworks/sproutcore/frameworks/runtime/ext/window.js +25 -0
  271. data/lib/frameworks/sproutcore/frameworks/runtime/mixins/array.js +3 -3
  272. data/lib/frameworks/sproutcore/frameworks/runtime/mixins/enumerable.js +1 -1
  273. data/lib/frameworks/sproutcore/frameworks/runtime/mixins/observable.js +156 -66
  274. data/lib/frameworks/sproutcore/frameworks/runtime/private/observer_set.js +2 -2
  275. data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js +150 -65
  276. data/lib/frameworks/sproutcore/frameworks/runtime/system/index_set.js +57 -11
  277. data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js +68 -49
  278. data/lib/frameworks/sproutcore/frameworks/runtime/system/run_loop.js +14 -6
  279. data/lib/frameworks/sproutcore/frameworks/runtime/system/string.js +23 -23
  280. data/lib/frameworks/sproutcore/frameworks/runtime/tests/ext/number_test.js +44 -0
  281. data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/array.js +0 -10
  282. data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/enumerable/enumerable.js +340 -285
  283. data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/binding.js +104 -3
  284. data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/observer_set.js +14 -1
  285. data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/string.js +15 -2
  286. data/lib/frameworks/sproutcore/frameworks/statechart/system/state.js +21 -18
  287. data/lib/frameworks/sproutcore/frameworks/statechart/system/statechart.js +52 -19
  288. data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/responder/pane.js +27 -24
  289. data/lib/frameworks/sproutcore/frameworks/template_view/controls/button.js +30 -0
  290. data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/bind.js +1 -1
  291. data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/collection.js +2 -0
  292. data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/view.js +1 -0
  293. data/lib/frameworks/sproutcore/frameworks/template_view/tests/mixins/template_helpers/checkbox_support.js +2 -2
  294. data/lib/frameworks/sproutcore/frameworks/template_view/tests/views/template/handlebars.js +4 -2
  295. data/lib/frameworks/sproutcore/frameworks/template_view/views/bindable_span.js +1 -1
  296. data/lib/frameworks/sproutcore/frameworks/template_view/views/template_collection.js +16 -14
  297. data/lib/frameworks/sproutcore/frameworks/testing/core.js +5 -3
  298. data/lib/frameworks/sproutcore/frameworks/testing/system/plan.js +13 -0
  299. data/lib/frameworks/sproutcore/lib/index.rhtml +2 -2
  300. data/lib/frameworks/sproutcore/phantomjs/test_runner.js +28 -7
  301. data/lib/frameworks/sproutcore/scripts/run_sc_server_master.sh +1 -1
  302. data/lib/frameworks/sproutcore/themes/ace/resources/_variables.css +2 -0
  303. data/lib/frameworks/sproutcore/themes/ace/resources/disclosure/ace/disclosure.css +1 -0
  304. data/lib/frameworks/sproutcore/themes/ace/resources/picker/popover/popover.css +3 -4
  305. data/lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal.css +15 -15
  306. data/lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal_overlay.css +74 -0
  307. data/lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical.css +11 -13
  308. data/lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical_overlay.css +74 -0
  309. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob-active.png +0 -0
  310. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob-active@2x.png +0 -0
  311. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob.png +0 -0
  312. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob@2x.png +0 -0
  313. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/{22px → jumbo}/slider.css +9 -4
  314. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/track.png +0 -0
  315. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/track@2x.png +0 -0
  316. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob-active.png +0 -0
  317. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob-active@2x.png +0 -0
  318. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob.png +0 -0
  319. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob@2x.png +0 -0
  320. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/slider.css +32 -0
  321. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/track.png +0 -0
  322. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/track@2x.png +0 -0
  323. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/slider.css +13 -0
  324. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob-active.png +0 -0
  325. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob-active@2x.png +0 -0
  326. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob.png +0 -0
  327. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob@2x.png +0 -0
  328. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/slider.css +32 -0
  329. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/track.png +0 -0
  330. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/track@2x.png +0 -0
  331. data/lib/frameworks/sproutcore/themes/ace/resources/split/split.css +2 -3
  332. data/lib/sproutcore/builders/chance_file.rb +3 -3
  333. data/lib/sproutcore/helpers/minifier.rb +1 -0
  334. data/vendor/chance/lib/chance/instance.rb +34 -34
  335. data/vendor/chance/lib/chance/instance/spriting.rb +21 -16
  336. metadata +81 -58
  337. data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/visibility.js +0 -17
  338. data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_fast_path.js +0 -710
  339. data/lib/frameworks/sproutcore/frameworks/desktop/mixins/scrollable.js +0 -267
  340. data/lib/frameworks/sproutcore/frameworks/desktop/resources/touch-scroller.css +0 -196
  341. data/lib/frameworks/sproutcore/frameworks/desktop/system/undo_manager.js +0 -224
  342. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/methods.js +0 -163
  343. data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/ui.js +0 -177
  344. data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll.js +0 -2053
  345. data/lib/frameworks/sproutcore/frameworks/desktop/views/select_button.js +0 -1024
  346. data/lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js +0 -404
  347. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/render_delegates/menu_scroller.js +0 -28
  348. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/tests/menu/scroll.js +0 -235
  349. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/views/menu/scroll.js +0 -363
  350. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/views/menu/scroller.js +0 -250
  351. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/README.md +0 -47
  352. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/models/record.js +0 -134
  353. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/desktop_scroller.js +0 -92
  354. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/native_scroll.js +0 -25
  355. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/scroll.js +0 -33
  356. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/touch_scroller.js +0 -76
  357. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/tests/scroll/integration.js +0 -25
  358. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/tests/scroll/methods.js +0 -143
  359. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/tests/scroll/ui.js +0 -256
  360. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/core_scroll.js +0 -1164
  361. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/core_scroller.js +0 -332
  362. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/desktop/scroll.js +0 -236
  363. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/desktop/scroller.js +0 -347
  364. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/scroll.js +0 -15
  365. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/scroller.js +0 -10
  366. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/touch/scroll.js +0 -804
  367. data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/touch/scroller.js +0 -133
  368. data/lib/frameworks/sproutcore/frameworks/foundation/tasks/preload_bundle.js +0 -41
  369. data/lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal_touch.css +0 -91
  370. data/lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical_touch.css +0 -92
  371. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/14px/knob.png +0 -0
  372. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/14px/knob_active.png +0 -0
  373. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/14px/slider.css +0 -27
  374. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/16px/knob.png +0 -0
  375. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/16px/knob_active.png +0 -0
  376. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/16px/slider.css +0 -27
  377. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/knob.png +0 -0
  378. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/knob_active.png +0 -0
  379. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/track.png +0 -0
  380. data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/track.png +0 -0
@@ -3,23 +3,28 @@ module("SC.ScrollView integration");
3
3
  test("should work with views that have static layout applied", function() {
4
4
  var pane;
5
5
  try {
6
- pane = SC.MainPane.create({
7
- childViews: ['scrollView'],
6
+ SC.run(function () {
7
+ pane = SC.MainPane.create({
8
+ childViews: ['scrollView'],
8
9
 
9
- scrollView: SC.ScrollView.design({
10
- layout: { width: 400, height: 600 },
10
+ scrollView: SC.ScrollView.design({
11
+ layout: { width: 400, height: 600 },
11
12
 
12
- contentView: SC.View.design({
13
- useStaticLayout: YES
13
+ contentView: SC.View.design({
14
+ useStaticLayout: YES
15
+ })
14
16
  })
15
- })
16
- });
17
+ });
17
18
 
18
- pane.append();
19
- SC.RunLoop.begin().end();
19
+ pane.append();
20
+ });
20
21
 
21
22
  ok(true, "displays scroll view without throwing an exception");
22
23
  } finally {
23
- if (pane) { pane.remove(); }
24
+ if (pane) {
25
+ SC.run(function () {
26
+ pane.remove();
27
+ });
28
+ }
24
29
  }
25
30
  });
@@ -14,21 +14,29 @@ module("SC.ScrollView", {
14
14
  setup: function () {
15
15
  SC.run(function () {
16
16
  pane = SC.MainPane.create({
17
+ layout: { height: 114, width: 114 }, // Gives us 100x100 container views without worrying about scrollers (or resorting to horrible, counterproductive hacks)
17
18
  childViews: [
19
+ // ScrollView with 4000x4000 contentView. "view" below.
18
20
  SC.ScrollView.extend({
19
- contentView: SC.ImageView.design({ value: appleURL, layout: { height: 4000, width: 4000 }})
21
+ contentView: SC.ImageView.design({ value: appleURL, layout: { height: 4000, width: 4000 }}),
22
+ horizontalAlign: SC.ALIGN_LEFT
20
23
  }),
24
+ // ScrollView with 2000x2000 contentView. "view2" below.
21
25
  SC.ScrollView.extend({
22
- contentView: SC.ImageView.design({ value: appleURL, layout: { height: 2000, width: 2000 }})
26
+ contentView: SC.ImageView.design({ value: appleURL, layout: { height: 2000, width: 2000 }}),
27
+ horizontalAlign: SC.ALIGN_LEFT
23
28
  }),
29
+ // ScrollView (view3 below) with nested ScrollView (view4 below).
24
30
  SC.ScrollView.extend({
25
31
  layout: { height: 400, width: 400 },
32
+ horizontalAlign: SC.ALIGN_LEFT,
26
33
  contentView: SC.View.design({
27
34
  layout: { height: 500, width: 500 },
28
35
  childViews: [
29
36
  SC.ScrollView.design({
30
37
  layout: { height: 200, width: 200, centerX: 0, centerY: 0 },
31
- contentView: SC.ImageView.design({ value: appleURL, layout: { height: 300, width: 300 }})
38
+ contentView: SC.ImageView.design({ value: appleURL, layout: { height: 300, width: 300 }}),
39
+ horizontalAlign: SC.ALIGN_LEFT
32
40
  })
33
41
  ]
34
42
  })
@@ -72,12 +80,8 @@ module("SC.ScrollView", {
72
80
  });
73
81
 
74
82
  view = pane.childViews[0];
75
- view.get('containerView').get('frame').height = 100;
76
- view.get('containerView').get('frame').width = 100;
77
83
 
78
84
  view2 = pane.childViews[1];
79
- view2.get('containerView').get('frame').height = 100;
80
- view2.get('containerView').get('frame').width = 100;
81
85
 
82
86
  view3 = pane.childViews[2];
83
87
  view4 = view3.get('contentView').get('childViews')[0];
@@ -92,6 +96,9 @@ module("SC.ScrollView", {
92
96
  });
93
97
 
94
98
 
99
+ // ------------------------------------
100
+ // scrollTo, scrollBy
101
+ //
95
102
 
96
103
  test("Scrolling to a certain co-ordinate of the container view", function () {
97
104
  equals(view.get('horizontalScrollOffset'), 0, "Initial horizontal offset must be zero");
@@ -133,6 +140,91 @@ test("Scrolling relative to the current possition of the container view", functi
133
140
  });
134
141
  });
135
142
 
143
+ // ----------------------------------------------
144
+ // scrollToRect, scrollToVisible, scrollDownLine
145
+ //
146
+
147
+ test("Scrolling to a rectangle", function () {
148
+ equals(view.get('horizontalScrollOffset'), 0, "Initial horizontal offset must be zero");
149
+ equals(view.get('verticalScrollOffset'), 0, "Initial vertical offset must be zero");
150
+
151
+ SC.run(function () {
152
+ view.scrollToRect({ x: 100, y: 100, width: 2000, height: 2000 });
153
+ equals(view.get('horizontalScrollOffset'), 100, "After scrolling to rect, horizontal offset must be 100");
154
+ equals(view.get('verticalScrollOffset'), 100, "After scrolling to rect, vertical offset must be 100");
155
+ });
156
+ });
157
+
158
+ test("Scrolling to a view", function() {
159
+ var pane = SC.MainPane.create({
160
+ childViews: ['scrollView'],
161
+ scrollView: SC.ScrollView.create({
162
+ layout: { height: 100, width: 100 },
163
+ canScale: YES,
164
+ contentView: SC.View.create({
165
+ layout: { height: 500, width: 500 },
166
+ childViews: ['innerView1', 'innerView2'],
167
+ innerView1: SC.View.create({
168
+ layout: { height: 100, width: 100, top: 150, left: 150 }
169
+ }),
170
+ innerView2: SC.View.create({
171
+ layout: { height: 100, width: 100, top: 200, left: 200 }
172
+ })
173
+ })
174
+ })
175
+ });
176
+
177
+ var scrollView = pane.scrollView,
178
+ contentView = scrollView.contentView,
179
+ innerView1 = scrollView.contentView.innerView1,
180
+ innerView2 = scrollView.contentView.innerView2;
181
+
182
+ SC.run(function() { pane.append(); }); // make sure we have a layer...
183
+
184
+ // Test scrolling to views.
185
+ SC.run(function() {
186
+ scrollView.scrollToVisible(innerView1);
187
+ });
188
+ equals(scrollView.get('verticalScrollOffset'), 150, "Scrolling to an inner view at top: 150 should offset the vertical scroll correctly");
189
+ equals(scrollView.get('horizontalScrollOffset'), 150, "Scrolling to an inner view at left: 150 should offset the horizontal scroll correctly");
190
+
191
+ SC.run(function() {
192
+ scrollView.scrollToVisible(innerView2);
193
+ });
194
+ equals(scrollView.get('verticalScrollOffset'), 200, "Scrolling to an inner view at top: 200 should offset the vertical scroll correctly");
195
+ equals(scrollView.get('horizontalScrollOffset'), 200, "Scrolling to an inner view at left: 200 should offset the horizontal scroll correctly");
196
+
197
+ SC.run(function() {
198
+ scrollView.scrollToVisible(contentView);
199
+ });
200
+ ok(!scrollView.get('horizontalScrollOffset') && !scrollView.get('verticalScrollOffset'), "Scrolling to the contentView itself should return to the upper left.");
201
+
202
+ // Test scrolling to views with scale.
203
+ SC.run(function() {
204
+ scrollView.set('scale', 2);
205
+ });
206
+
207
+ SC.run(function() {
208
+ scrollView.scrollToVisible(innerView1);
209
+ });
210
+ equals(scrollView.get('verticalScrollOffset'), 300, "Scrolling to an inner view at top: 150 with a content scale of 2 should offset the vertical scroll correctly");
211
+ equals(scrollView.get('horizontalScrollOffset'), 300, "Scrolling to an inner view at left: 150 with a content scale of 2 should offset the horizontal scroll correctly");
212
+
213
+ SC.run(function() {
214
+ scrollView.scrollToVisible(innerView2);
215
+ });
216
+ equals(scrollView.get('verticalScrollOffset'), 400, "Scrolling to an inner view at top: 200 with a content scale of 2 should offset the vertical scroll correctly");
217
+ equals(scrollView.get('horizontalScrollOffset'), 400, "Scrolling to an inner view at left: 200 with a content scale of 2 should offset the horizontal scroll correctly");
218
+
219
+ SC.run(function() {
220
+ scrollView.scrollToVisible(contentView);
221
+ });
222
+ ok(!scrollView.get('horizontalScrollOffset') && !scrollView.get('verticalScrollOffset'), "Scrolling to the contentView itself should return to the upper left (regardless of scale).");
223
+
224
+ // Cleanup.
225
+ pane.destroy();
226
+ });
227
+
136
228
  test("Scrolling through line by line", function () {
137
229
  var line = 3;
138
230
  equals(view.get('horizontalScrollOffset'), 0, "Initial horizontal offset must be zero");
@@ -147,6 +239,10 @@ test("Scrolling through line by line", function () {
147
239
  });
148
240
  });
149
241
 
242
+ // ------------------------------------
243
+ // maximum[Horizontal|Vertical]ScrollOffset
244
+ //
245
+
150
246
  test("maximumHorizontalScrollOffset() returns the maximum horizontal scroll dimension", function () {
151
247
  var old_horizontalScrollOffset = 2;
152
248
  var old_verticalScrollOffset = 2;
@@ -155,7 +251,7 @@ test("maximumHorizontalScrollOffset() returns the maximum horizontal scroll dime
155
251
  view2.set('horizontalScrollOffset', old_horizontalScrollOffset);
156
252
  view2.set('verticalScrollOffset', old_verticalScrollOffset);
157
253
  view2.scrollBy(5000, 0);
158
- equals(view2.get('horizontalScrollOffset'), 1900, 'maximum y coordinate should be 1900');
254
+ equals(view2.get('horizontalScrollOffset'), 1900, 'maximum x coordinate should be 1900');
159
255
  });
160
256
 
161
257
 
@@ -163,7 +259,7 @@ test("maximumHorizontalScrollOffset() returns the maximum horizontal scroll dime
163
259
  view2.set('horizontalScrollOffset', old_horizontalScrollOffset);
164
260
  view2.set('verticalScrollOffset', old_verticalScrollOffset);
165
261
  view2.scrollBy(-5000, 0);
166
- equals(view2.get('horizontalScrollOffset'), 0, 'minimum y coordinate should be 0');
262
+ equals(view2.get('horizontalScrollOffset'), 0, 'minimum x coordinate should be 0');
167
263
  });
168
264
 
169
265
  });
@@ -176,7 +272,7 @@ test("maximumVerticalScrollOffset() returns the maximum vertical scroll dimensio
176
272
  view2.set('horizontalScrollOffset', old_horizontalScrollOffset);
177
273
  view2.set('verticalScrollOffset', old_verticalScrollOffset);
178
274
  view2.scrollBy(0, 5000);
179
- equals(view2.get('verticalScrollOffset'), 1900, 'maximum coordinate should be 1900');
275
+ equals(view2.get('verticalScrollOffset'), 1900, 'maximum y coordinate should be 1900');
180
276
  });
181
277
 
182
278
  SC.run(function () {
@@ -188,13 +284,15 @@ test("maximumVerticalScrollOffset() returns the maximum vertical scroll dimensio
188
284
 
189
285
  });
190
286
 
287
+ // ------------------------------------
288
+ // mouseWheel events
289
+ //
191
290
 
192
291
  test("Mouse wheel events should only be captured if the scroll can scroll in the direction (both TOP-LEFT).", function () {
193
292
  // FIRST GROUP: everything scrolled all the way to the top left
194
293
  SC.run(function () {
195
294
  view3.scrollTo(0, 0);
196
295
  view4.scrollTo(0, 0);
197
- });
198
296
 
199
297
  // Scrolling further left is not captured by either scroll view
200
298
  ok(!view3.mouseWheel({ wheelDeltaX: -10, wheelDeltaY: 0 }), 'The inner scroll view should not capture the mousewheel event since it cannot scroll further.');
@@ -211,13 +309,13 @@ test("Mouse wheel events should only be captured if the scroll can scroll in the
211
309
  // Scrolling right is captured by the target scroll view
212
310
  ok(view3.mouseWheel({ wheelDeltaX: 0, wheelDeltaY: 10 }), 'The inner scroll view should capture the mousewheel event since it can scroll further.');
213
311
  ok(view4.mouseWheel({ wheelDeltaX: 0, wheelDeltaY: 10 }), 'The outer scroll view should capture the mousewheel event since it can scroll further.');
312
+ });
214
313
  });
215
314
 
216
315
  test("Mouse wheel events should only be captured if the scroll can scroll in the direction (both BOTTOM-RIGHT).", function () {
217
316
  SC.run(function () {
218
317
  view3.scrollTo(114, 114);
219
318
  view4.scrollTo(114, 114);
220
- });
221
319
 
222
320
  // Scrolling further right is not captured by either scroll view
223
321
  ok(!view3.mouseWheel({ wheelDeltaX: 10, wheelDeltaY: 0 }), 'The inner scroll view should not capture the mousewheel event since it cannot scroll further.');
@@ -234,6 +332,7 @@ test("Mouse wheel events should only be captured if the scroll can scroll in the
234
332
  // Scrolling left is captured by the target scroll view
235
333
  ok(view3.mouseWheel({ wheelDeltaX: 0, wheelDeltaY: -10 }), 'The inner scroll view should capture the mousewheel event since it can scroll further.');
236
334
  ok(view4.mouseWheel({ wheelDeltaX: 0, wheelDeltaY: -10 }), 'The outer scroll view should capture the mousewheel event since it can scroll further.');
335
+ });
237
336
  });
238
337
 
239
338
  test("Mouse wheel events not capturable by the inner scroll should bubble to the outer scroll (scroll right).", function () {
@@ -418,3 +517,56 @@ test("Mouse wheel events capturable by the inner scroll should not bubble to the
418
517
  }, interval: 200 });
419
518
  SC.RunLoop.end();
420
519
  });
520
+
521
+ // ------------------------------------
522
+ // scale
523
+ //
524
+
525
+ test("Setting scale on ScrollView", function() {
526
+ // canScale: NO
527
+ SC.run(function() {
528
+ view.set('scale', 0.8);
529
+ });
530
+ equals(view.get('scale'), 1, "Setting scale on a ScrollView with canScale: NO doesn't change scale.");
531
+
532
+ // canScale: YES
533
+ SC.run(function() {
534
+ view.set('canScale', YES);
535
+ view.set('scale', 0.8);
536
+ });
537
+ equals(view.get('scale'), 0.8, "Setting scale on a ScrollView with canScale: YES changes scale");
538
+
539
+ // Exceeding min
540
+ SC.run(function() {
541
+ view.set('scale', -100);
542
+ });
543
+ equals(view.get('scale'), view.get('minimumScale'), "Scale is constrained by minimumScale");
544
+
545
+ // Exceeding max
546
+ SC.run(function() {
547
+ view.set('scale', 100);
548
+ });
549
+ equals(view.get('scale'), view.get('maximumScale'), "Scale is constrained by maximumScale");
550
+
551
+ });
552
+
553
+ // test("Setting scale on ScrollView with SC.Scalable contentView", function() {
554
+ // var contentView = view.get('contentView'),
555
+ // didCall, withScale;
556
+
557
+ // // Patch in SC.Scalable support.
558
+ // contentView.isScalable = YES;
559
+ // contentView.applyScale = function(scale) {
560
+ // didCall = YES;
561
+ // withScale = scale;
562
+ // };
563
+
564
+ // SC.run(function() {
565
+ // view.set('canScale', YES);
566
+ // view.set('scale', 0.8);
567
+ // });
568
+ // ok(didCall, "Setting scale on ScrollView with SC.Scalable contentView calls contentView.applyScale.");
569
+ // equals(withScale, 0.8, "Setting scale on ScrollView with SC.Scalable contentView passes the correct scale to contentView.applyScale");
570
+ // });
571
+
572
+
@@ -0,0 +1,387 @@
1
+ // ==========================================================================
2
+ // Project: SproutCore - JavaScript Application Framework
3
+ // Copyright: ©2006-2011 Strobe Inc. and contributors.
4
+ // portions copyright @2011 Apple Inc.
5
+ // License: Licensed under MIT license (see license.js)
6
+ // ==========================================================================
7
+
8
+ /*global module, test, equals */
9
+
10
+ var pane;
11
+ var imageUrl = sc_static('images/sproutcore-512.png'); // 'http://photos4.meetupstatic.com/photos/event/4/6/9/9/600_4518073.jpeg';
12
+
13
+ var scrollViewOriginalHeight = 100;
14
+ var scrollViewOriginalWidth = 200;
15
+
16
+ var contentViewOriginalHeight = 400;
17
+ var contentViewOriginalWidth = 400;
18
+
19
+ var pane = SC.ControlTestPane.design()
20
+ .add("scrollView with content view of fixed height", SC.ScrollView.design({
21
+ // ScrollView with overflowing contentView
22
+ layout: { top: 0, left: 0, height: scrollViewOriginalHeight, width: scrollViewOriginalWidth },
23
+ contentView: SC.ImageView.design({ value: imageUrl, layout: { height: contentViewOriginalHeight, width: contentViewOriginalWidth }}),
24
+
25
+ canScale: YES,
26
+ minimumScale: 0.01,
27
+ maximumScale: 100
28
+ }))
29
+ .add("scrollview with content view attached to top and bottom", SC.ScrollView.design({
30
+ // ScrollView with overflowing contentView
31
+ layout: { top: 0, left: 0, height: scrollViewOriginalHeight, width: scrollViewOriginalWidth },
32
+ contentView: SC.ImageView.design({ value: imageUrl, layout: { top: 0, bottom: 0, width: contentViewOriginalWidth }}),
33
+
34
+ canScale: YES,
35
+ minimumScale: 0.01,
36
+ maximumScale: 100
37
+ }))
38
+ .add("scrollView with content view of fixed height center-center-aligned", SC.ScrollView.design({
39
+ // ScrollView with overflowing contentView
40
+ layout: { top: 0, left: 0, height: scrollViewOriginalHeight, width: scrollViewOriginalWidth },
41
+ contentView: SC.ImageView.design({ value: imageUrl, layout: { height: contentViewOriginalHeight, width: contentViewOriginalWidth }}),
42
+
43
+ canScale: YES,
44
+ minimumScale: 0.01,
45
+ maximumScale: 100,
46
+
47
+ horizontalAlign: SC.ALIGN_CENTER,
48
+ verticalAlign: SC.ALIGN_MIDDLE
49
+ }))
50
+ .add("scrollView with content view of fixed height bottom-right-aligned", SC.ScrollView.design({
51
+ // ScrollView with overflowing contentView
52
+ layout: { top: 0, left: 0, height: scrollViewOriginalHeight, width: scrollViewOriginalWidth },
53
+ contentView: SC.ImageView.design({ value: imageUrl, layout: { height: contentViewOriginalHeight, width: contentViewOriginalWidth }}),
54
+
55
+ canScale: YES,
56
+ minimumScale: 0.01,
57
+ maximumScale: 100,
58
+
59
+ horizontalAlign: SC.ALIGN_RIGHT,
60
+ verticalAlign: SC.ALIGN_BOTTOM
61
+ }))
62
+ .add("scrollView with content view of fixed height and bottom-right initial alignment", SC.ScrollView.design({
63
+ // ScrollView with overflowing contentView
64
+ layout: { top: 0, left: 0, height: scrollViewOriginalHeight, width: scrollViewOriginalWidth },
65
+ contentView: SC.ImageView.design({ value: imageUrl, layout: { height: contentViewOriginalHeight, width: contentViewOriginalWidth }}),
66
+
67
+ canScale: YES,
68
+ minimumScale: 0.01,
69
+ maximumScale: 100,
70
+
71
+ horizontalAlign: SC.ALIGN_LEFT,
72
+ verticalAlign: SC.ALIGN_TOP,
73
+ initialHorizontalAlign: SC.ALIGN_RIGHT,
74
+ initialVerticalAlign: SC.ALIGN_BOTTOM
75
+ }));
76
+
77
+ module("SC.ScrollView", {
78
+ setup: function () {
79
+ pane.standardSetup().setup();
80
+ },
81
+
82
+ teardown: function () {
83
+ pane.standardSetup().teardown();
84
+ }
85
+ });
86
+
87
+ // ------------------------------
88
+ // BASIC
89
+ //
90
+
91
+ test('Initial values of scale and horizontal offsets are good', function () {
92
+ var scrollView = pane.view('scrollView with content view of fixed height');
93
+
94
+ equals(scrollView.get('scale'), 1, 'Initial scale is 1');
95
+
96
+ equals(scrollView.get('horizontalScrollOffset'), 107, 'Initial horizontal offset must be half the maximumHorizontalScrollOffset');
97
+ equals(scrollView.get('verticalScrollOffset'), 0, 'Initial vertical offset must be zero');
98
+ });
99
+
100
+ test("Content view is scaled based on scroll view's scale property", function() {
101
+ var scrollView = pane.view('scrollView with content view of fixed height'),
102
+ contentView = scrollView.get('contentView');
103
+
104
+ SC.run(function() {
105
+ scrollView.set('scale', 0.1);
106
+ });
107
+
108
+ equals(scrollView.get('scale'), 0.1, 'Scale has been updated to 0.1');
109
+
110
+ equals(contentView.getPath('frame.width'), 0.1 * contentViewOriginalWidth, "Content view's width is scaled smaller based on scroll view's scale");
111
+ equals(contentView.getPath('frame.height'), 0.1 * contentViewOriginalHeight, "Content view's height is scaled smaller based on scroll view's scale");
112
+
113
+ SC.run(function() {
114
+ scrollView.set('scale', 10);
115
+ });
116
+
117
+ equals(scrollView.get('scale'), 10, 'Scale has been updated to 10');
118
+
119
+ equals(contentView.getPath('frame.width'), 10 * contentViewOriginalWidth, "Content view's width is scaled larger based on scroll view's scale");
120
+ equals(contentView.getPath('frame.height'), 10 * contentViewOriginalHeight, "Content view's height is scaled larger based on scroll view's scale");
121
+
122
+ });
123
+
124
+ // ------------------------------
125
+ // Fully visible - static
126
+ //
127
+
128
+ test('When contentView is fully visible, it is positioned according to horizontalAlign', function() {
129
+ var scrollView = pane.view('scrollView with content view of fixed height'),
130
+ containerView = scrollView.get('containerView'),
131
+ contentView = scrollView.get('contentView');
132
+
133
+ SC.run(function() {
134
+ scrollView.set('scale', 0.1);
135
+ });
136
+
137
+ SC.run(function() {
138
+ scrollView.set('horizontalAlign', SC.ALIGN_LEFT);
139
+ });
140
+
141
+ equals(contentView.getPath('frame.x'), 0, "Content view's x offset is 0 when horizontalAlign is set to SC.ALIGN_LEFT");
142
+
143
+ SC.run(function() {
144
+ scrollView.set('horizontalAlign', SC.ALIGN_CENTER);
145
+ });
146
+
147
+ var expectedContentViewOffsetX = (containerView.getPath('frame.width') - contentView.getPath('frame.width')) / 2;
148
+ expectedContentViewOffsetX = Math.round(expectedContentViewOffsetX);
149
+ equals(contentView.getPath('frame.x'), expectedContentViewOffsetX, "Content view is centered when horizontalAlign is set to SC.ALIGN_CENTER");
150
+
151
+ SC.run(function() {
152
+ scrollView.set('horizontalAlign', SC.ALIGN_RIGHT);
153
+ });
154
+
155
+ expectedContentViewOffsetX = containerView.getPath('frame.width') - contentView.getPath('frame.width');
156
+ expectedContentViewOffsetX = Math.round(expectedContentViewOffsetX);
157
+
158
+ equals(contentView.getPath('frame.x'), expectedContentViewOffsetX, "Content view is aligned right when horizontalAlign is set to SC.ALIGN_RIGHT");
159
+ });
160
+
161
+ test('When contentView is fully visible, it is positioned according to verticalAlign', function() {
162
+ var scrollView = pane.view('scrollView with content view of fixed height'),
163
+ containerView = scrollView.get('containerView'),
164
+ contentView = scrollView.get('contentView');
165
+
166
+ SC.run(function() {
167
+ scrollView.set('scale', 0.1);
168
+ });
169
+
170
+ SC.run(function() {
171
+ scrollView.set('verticalAlign', SC.ALIGN_TOP);
172
+ });
173
+
174
+ equals(contentView.getPath('frame.y'), 0, "Content view's y offset is 0 when verticalAlign is set to SC.ALIGN_TOP");
175
+
176
+ SC.run(function() {
177
+ scrollView.set('verticalAlign', SC.ALIGN_MIDDLE);
178
+ });
179
+
180
+ var expectedContentViewOffsetX = (containerView.getPath('frame.height') - contentView.getPath('frame.height')) / 2;
181
+ expectedContentViewOffsetX = Math.round(expectedContentViewOffsetX);
182
+
183
+ equals(contentView.getPath('frame.y'), expectedContentViewOffsetX, "Content view is centered when verticalAlign is set to SC.ALIGN_MIDDLE");
184
+
185
+ SC.run(function() {
186
+ scrollView.set('verticalAlign', SC.ALIGN_BOTTOM);
187
+ });
188
+
189
+ expectedContentViewOffsetX = containerView.getPath('frame.height') - contentView.getPath('frame.height');
190
+ expectedContentViewOffsetX = Math.round(expectedContentViewOffsetX);
191
+
192
+ equals(contentView.getPath('frame.y'), expectedContentViewOffsetX, "Content view is aligned to the bottom when verticalAlign is set to SC.ALIGN_BOTTOM");
193
+ });
194
+
195
+ // ------------------------------
196
+ // Zoomed in - static
197
+ //
198
+
199
+ test('When zoomed into the contentView, the content view should remain centered around visible center', function() {
200
+ var scrollView = pane.view('scrollView with content view of fixed height'),
201
+ containerFrame = scrollView.getPath('containerView.frame');
202
+
203
+ // The percentage offsets for horizontal: ALIGN_CENTER & vertical: ALIGN_TOP for the given content and container size.
204
+ var hPct = 0.5,
205
+ vPct = 0.1075;
206
+
207
+ SC.run(function() {
208
+ // Note: Before any scrolling occurs, scale changes adhere to initial alignments.
209
+ scrollView.set('horizontalScrollOffset', scrollView.get('horizontalScrollOffset'));
210
+ scrollView.set('verticalScrollOffset', scrollView.get('verticalScrollOffset'));
211
+
212
+ scrollView.set('scale', 10);
213
+ });
214
+
215
+ var newOffsets = {
216
+ h: hPct * (scrollView.get('maximumHorizontalScrollOffset') + containerFrame.width) - (containerFrame.width / 2),
217
+ v: vPct * (scrollView.get('maximumVerticalScrollOffset') + containerFrame.height) - (containerFrame.height / 2)
218
+ };
219
+
220
+ equals(scrollView.get('horizontalScrollOffset'), newOffsets.h, "Content view left offset remains centered to visible center when zoomed into contentView");
221
+ equals(scrollView.get('verticalScrollOffset'), newOffsets.v, "Content view top offset remains centered to visible center when zoomed into contentView");
222
+ });
223
+
224
+ // ------------------------------
225
+ // Zooming in
226
+ //
227
+
228
+ /*
229
+ The following tests ensure that the content sticks to minimums or maximums when scaling. However, this seems like the incorrect
230
+ behavior. Instead zooming should respect the content's visible center (e.g. OS X Preview zooming behavior).
231
+ */
232
+ // test('When zoomed into the contentView, the horizontal offset should stick to minimum if it was previously set to minimum', function() {
233
+ // var scrollView = pane.view('scrollView with content view of fixed height'),
234
+ // containerFrame = scrollView.getPath('containerView.frame');
235
+
236
+ // // first, zoom in a bit and set the horizontal offset to minimum
237
+ // SC.run(function() {
238
+ // scrollView.set('scale', 10);
239
+ // scrollView.set('horizontalScrollOffset', scrollView.get('minimumHorizontalScrollOffset'));
240
+ // });
241
+
242
+ // // verify that the horizontal offset is minimum
243
+
244
+ // equals(scrollView.get('horizontalScrollOffset'), scrollView.get('minimumHorizontalScrollOffset'), 'Horizontal offset is at minimum after setting it to be thus');
245
+
246
+ // // now, zoom in a bit more and make sure it's still minimum
247
+
248
+ // // The percentage offsets for horizontal: 0 @ scale of 10 & vertical: ALIGN_TOP for the given content and container size.
249
+ // var hPct = (0 + (containerFrame.width / 2)) / (scrollView.get('maximumHorizontalScrollOffset') + containerFrame.width),
250
+ // vPct = 0.125;
251
+
252
+ // SC.run(function() {
253
+ // scrollView.set('scale', 11);
254
+ // });
255
+
256
+ // var newOffsets = {
257
+ // h: hPct * (scrollView.get('maximumHorizontalScrollOffset') + containerFrame.width) - (containerFrame.width / 2),
258
+ // v: vPct * (scrollView.get('maximumVerticalScrollOffset') + containerFrame.height) - (containerFrame.height / 2)
259
+ // };
260
+
261
+ // equals(scrollView.get('horizontalScrollOffset'), newOffsets.h, 'Horizontal offset is still at minimum after scaling');
262
+ // });
263
+
264
+ // test('When zoomed into the contentView, the horizontal offset should stick to maximum if it was previously set to maximum', function() {
265
+ // var scrollView = pane.view('scrollView with content view of fixed height');
266
+
267
+ // // first, zoom in a bit and set the horizontal offset to maximum
268
+ // SC.run(function() {
269
+ // scrollView.set('scale', 10);
270
+ // scrollView.scrollTo(scrollView.get('maximumHorizontalScrollOffset'));
271
+ // });
272
+
273
+ // // verify that the horizontal offset is maximum
274
+
275
+ // equals(scrollView.get('horizontalScrollOffset'), scrollView.get('maximumHorizontalScrollOffset'), 'Horizontal offset is at maximum after setting it to be thus');
276
+
277
+ // // now, zoom in a bit more and make sure it's still maximum
278
+
279
+ // SC.run(function() {
280
+ // scrollView.set('scale', 11);
281
+ // });
282
+
283
+ // equals(scrollView.get('horizontalScrollOffset'), scrollView.get('maximumHorizontalScrollOffset'), 'Horizontal offset is still at maximum after scaling');
284
+ // });
285
+
286
+ // test('When zoomed into the contentView, the vertical offset should stick to minimum if it was previously set to minimum', function() {
287
+ // var scrollView = pane.view('scrollView with content view of fixed height');
288
+
289
+ // // first, zoom in a bit and set the vertical offset to minimum
290
+ // SC.run(function() {
291
+ // scrollView.set('scale', 10);
292
+ // scrollView.scrollTo(null, scrollView.get('minimumVerticalScrollOffset'));
293
+ // });
294
+
295
+ // // verify that the vertical offset is minimum
296
+
297
+ // equals(scrollView.get('verticalScrollOffset'), scrollView.get('minimumVerticalScrollOffset'), 'Vertical offset is at minimum after setting it to be thus');
298
+
299
+ // // now, zoom in a bit more and make sure it's still minimum
300
+
301
+ // SC.run(function() {
302
+ // scrollView.set('scale', 11);
303
+ // });
304
+
305
+ // equals(scrollView.get('verticalScrollOffset'), scrollView.get('minimumVerticalScrollOffset'), 'Vertical offset is still at minimum after scaling');
306
+ // });
307
+
308
+ // test('When zoomed into the contentView, the vertical offset should stick to maximum if it was previously set to maximum', function() {
309
+ // var scrollView = pane.view('scrollView with content view of fixed height');
310
+
311
+ // // first, zoom in a bit and set the vertical offset to maximum
312
+ // SC.run(function() {
313
+ // scrollView.set('scale', 10);
314
+ // scrollView.scrollTo(null, scrollView.get('maximumVerticalScrollOffset'));
315
+ // });
316
+
317
+ // // verify that the vertical offset is maximum
318
+
319
+ // equals(scrollView.get('verticalScrollOffset'), scrollView.get('maximumVerticalScrollOffset'), 'Vertical offset is at maximum after setting it to be thus');
320
+
321
+ // // now, zoom in a bit more and make sure it's still maximum
322
+
323
+ // SC.run(function() {
324
+ // scrollView.set('scale', 11);
325
+ // });
326
+
327
+ // equals(scrollView.get('verticalScrollOffset'), scrollView.get('maximumVerticalScrollOffset'), 'Vertical offset is still at maximum after scaling');
328
+ // });
329
+
330
+ // ---------------------------------------------------
331
+ // Zooming in from fully-visible with fresh view
332
+ //
333
+
334
+ // test("Zooming from fully-visible to clipped with different alignments", function() {
335
+
336
+ // // TOP & LEFT
337
+ // var scrollView = pane.view('scrollView with content view of fixed height');
338
+
339
+ // SC.run(function() {
340
+ // scrollView.set('scale', 0.1);
341
+ // });
342
+ // SC.run(function() {
343
+ // scrollView.set('scale', 1);
344
+ // });
345
+ // equals(scrollView.get('horizontalScrollOffset'), 0, "Scaling a fresh left-aligned view in from fully-visible aligns it to the left");
346
+ // equals(scrollView.get('verticalScrollOffset'), 0, "Scaling a fresh top-aligned view in from fully-visible aligns it to the top");
347
+
348
+ // // CENTER
349
+ // scrollView = pane.view('scrollView with content view of fixed height center-center-aligned');
350
+
351
+ // SC.run(function() {
352
+ // scrollView.set('scale', 0.1);
353
+ // });
354
+ // SC.run(function() {
355
+ // scrollView.set('scale', 1);
356
+ // });
357
+ // equals(scrollView.get('horizontalScrollOffset'), (scrollView.get('maximumHorizontalScrollOffset')) / 2, "Scaling a fresh horizontally-center-aligned view in from fully-visible aligns it to the center");
358
+ // equals(scrollView.get('verticalScrollOffset'), (scrollView.get('maximumVerticalScrollOffset')) / 2, "Scaling a fresh vertically-middle-aligned view in from fully-visible aligns it to the center");
359
+
360
+ // // BOTTOM & RIGHT
361
+ // scrollView = pane.view('scrollView with content view of fixed height bottom-right-aligned');
362
+
363
+ // SC.run(function() {
364
+ // scrollView.set('scale', 0.1);
365
+ // });
366
+ // SC.run(function() {
367
+ // scrollView.set('scale', 1);
368
+ // });
369
+ // equals(scrollView.get('horizontalScrollOffset'), scrollView.get('maximumHorizontalScrollOffset'), "Scaling a fresh right-aligned view in from fully-visible aligns it to the right");
370
+ // equals(scrollView.get('verticalScrollOffset'), scrollView.get('maximumVerticalScrollOffset'), "Scaling a fresh bottom-aligned view in from fully-visible aligns it to the bottom");
371
+ // });
372
+
373
+ test("Initial alignments different than alignments", function() {
374
+ // This view is aligned top-left but with initial position at bottom-right. It should start at maximum offsets; when
375
+ // scaled out it should instead pin to the minimum offsets.
376
+ var view = pane.view('scrollView with content view of fixed height and bottom-right initial alignment');
377
+ equals(view.get('horizontalScrollOffset'), view.get('maximumHorizontalScrollOffset'), "initialHorizontalAlign correctly informs initial position when not scaled out");
378
+ equals(view.get('verticalScrollOffset'), view.get('maximumVerticalScrollOffset'), "initialVerticalAlign correctly informs initial position when not scaled out");
379
+
380
+ SC.run(function() {
381
+ view.set('scale', 0.1);
382
+ });
383
+
384
+ equals(view.get('horizontalScrollOffset'), 0, "horizontalAlign correctly takes over from initialHorizontalAlign when scaled out");
385
+ equals(view.get('verticalScrollOffset'), 0, "verticalAlign correctly takes over from initialVerticalAlign when scaled out");
386
+
387
+ });