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.
- checksums.yaml +8 -8
- data/CHANGELOG +4 -8
- data/VERSION.yml +2 -2
- data/lib/frameworks/sproutcore/Buildfile +5 -4
- data/lib/frameworks/sproutcore/CHANGELOG.md +274 -40
- data/lib/frameworks/sproutcore/CONTRIBUTORS.md +133 -0
- data/lib/frameworks/sproutcore/README.md +31 -144
- data/lib/frameworks/sproutcore/apps/showcase/controllers/source_tree_controller.js +9 -4
- data/lib/frameworks/sproutcore/apps/showcase/resources/stylesheet.css +5 -0
- data/lib/frameworks/sproutcore/apps/showcase/system/views_item_content.js +1 -1
- data/lib/frameworks/sproutcore/apps/showcase/views/split_views.js +15 -2
- data/lib/frameworks/sproutcore/apps/showcase/views/stacked_views.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/english.lproj/main_page.js +11 -1
- data/lib/frameworks/sproutcore/frameworks/ajax/mixins/websocket_delegate.js +90 -0
- data/lib/frameworks/sproutcore/frameworks/ajax/system/request.js +81 -5
- data/lib/frameworks/sproutcore/frameworks/ajax/system/response.js +23 -4
- data/lib/frameworks/sproutcore/frameworks/ajax/system/websocket.js +475 -0
- data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/request.js +149 -26
- data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/websocket.js +197 -0
- data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/xhr_response_test.js +65 -0
- data/lib/frameworks/sproutcore/frameworks/bootstrap/system/loader.js +4 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/child_view_layouts/horizontal_stack_layout.js +232 -52
- data/lib/frameworks/sproutcore/frameworks/core_foundation/child_view_layouts/vertical_stack_layout.js +235 -49
- data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/array.js +23 -13
- data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/object.js +3 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/core.js +81 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/english.lproj/ordinal.js +17 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/string.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/{desktop/tests/views/disclosure/methods.js → core_foundation/french.lproj/ordinal.js} +7 -4
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/layout.js +2 -6
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/main.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane.js +104 -69
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane_statechart.js +6 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/protocols/child_view_layout_protocol.js +59 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/protocols/view_transition_protocol.js +18 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/application.js +192 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/bezier_curves.js +52 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/color.js +384 -64
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/core_query.js +6 -14
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/device.js +21 -35
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/event.js +72 -36
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/locale.js +90 -34
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/platform.js +55 -7
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/render_context.js +20 -15
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/req_anim_frame.js +9 -10
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/root_responder.js +763 -542
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/selection_set.js +4 -3
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/sparse_array.js +1 -7
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/string.js +14 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/touch.js +538 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/utils/rect.js +56 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/array_case.js +99 -4
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/single_case.js +25 -19
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/core_tests.js +75 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/ext/number_test.js +81 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/action_support.js +4 -4
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/responder_context.js +4 -4
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/string.js +19 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/color.js +36 -20
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/design_modes_test.js +83 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/makeMainPane.js +7 -3
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/mouse_events.js +338 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/root_responder.js +14 -89
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/touch.js +106 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/sparse_array.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/touch.js +136 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/utils/rect.js +42 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/append_remove.js +11 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/child_view.js +5 -5
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/design_mode_test.js +457 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/sendEvent.js +36 -10
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/background_color.js +44 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/border_frame_test.js +51 -24
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/childViewLayout_test.js +176 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/clippingFrame.js +46 -16
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/convertFrames.js +69 -15
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/didAppendToDocument.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layout.js +7 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutDidChange.js +30 -10
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutStyle.js +376 -71
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/static_layout.js +0 -10
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/viewDidResize.js +117 -34
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/view_states_test.js +52 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js +656 -42
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/animation.js +159 -38
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/cursor.js +0 -7
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/design_mode.js +206 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/enabled.js +0 -28
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/keyboard.js +21 -6
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout.js +372 -450
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout_style.js +28 -13
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/manipulation.js +22 -51
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/statechart.js +59 -30
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/theming.js +0 -29
- data/lib/frameworks/sproutcore/frameworks/datastore/mixins/relationship_support.js +22 -10
- data/lib/frameworks/sproutcore/frameworks/datastore/models/children_attribute.js +42 -36
- data/lib/frameworks/sproutcore/frameworks/datastore/models/many_attribute.js +54 -3
- data/lib/frameworks/sproutcore/frameworks/datastore/models/record.js +178 -59
- data/lib/frameworks/sproutcore/frameworks/datastore/models/record_attribute.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/system/child_array.js +206 -132
- data/lib/frameworks/sproutcore/frameworks/datastore/system/many_array.js +214 -118
- data/lib/frameworks/sproutcore/frameworks/datastore/system/nested_store.js +96 -13
- data/lib/frameworks/sproutcore/frameworks/datastore/system/query.js +14 -4
- data/lib/frameworks/sproutcore/frameworks/datastore/system/record_array.js +82 -42
- data/lib/frameworks/sproutcore/frameworks/datastore/system/store.js +272 -177
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/store_interaction_test.js +54 -0
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/datetime_recordattribute.js +24 -16
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/many_attribute.js +6 -3
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/data_store.js +267 -35
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record.js +57 -46
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array.js +150 -53
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array_complex.js +57 -17
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_complex.js +13 -9
- data/lib/frameworks/sproutcore/frameworks/{experimental/frameworks/polymorphism → datastore}/tests/models/polymorphism/many.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/{experimental/frameworks/polymorphism → datastore}/tests/models/polymorphism/simple.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{experimental/frameworks/polymorphism → datastore}/tests/models/polymorphism/single.js +12 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/writeAttribute.js +20 -15
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record_attribute.js +9 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/many_array/core_methods.js +80 -14
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/autonomous_dataSourceCallbacks.js +280 -0
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/autonomous_pushChanges.js +232 -0
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/chain.js +31 -5
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/parse.js +16 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/core_methods.js +60 -40
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/materializeRecord.js +78 -0
- data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/system/datetime.js +13 -1
- data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/tests/system/datetime.js +20 -0
- data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/{resources → english.lproj}/strings.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/french.lproj/strings.js +45 -0
- data/lib/frameworks/sproutcore/frameworks/designer/designers/object_designer.js +7 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_row_delegate.js +125 -44
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/alert.js +139 -48
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/draggable.js +202 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js +59 -56
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/palette.js +13 -49
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/picker.js +466 -305
- data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drag_source.js +49 -12
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/slider.js +79 -21
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/split.js +12 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/resources/menu_item_view.css +8 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/resources/overlay-scroller.css +187 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/system/drag.js +94 -30
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/ui.js +163 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/menu/methods.js +97 -78
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/menu/ui.js +61 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/methods.js +7 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/ui.js +47 -22
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/methods.js +66 -9
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/ui.js +21 -11
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/sheet/ui.js +12 -18
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/methods.js +17 -14
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/ui.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/checkbox/methods.js +9 -6
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/collection_fast_path.js +54 -21
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/content.js +52 -20
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/itemViewForContentIndex.js +94 -4
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/keyboard.js +177 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/layerIdFor.js +13 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/length.js +9 -9
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/mouse.js +18 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/date_field/methods.js +104 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/disclosure/ui.js +48 -49
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/grid/drag_and_drop.js +22 -18
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/grid/methods.js +17 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/link_view_test.js +136 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/contentIndexesInRect.js +77 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/drag_and_drop.js +53 -16
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/layoutForContentIndex.js +41 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowDelegate.js +25 -25
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowOffsetForContentIndex.js +102 -27
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/{rowHeightForContentIndex.js → rowSizeForContentIndex.js} +7 -6
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_outline.js +2 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_row_heights.js +70 -75
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_simple.js +29 -30
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list_item.js +57 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/menu_scroll_view/menu_scroll_view_test.js +206 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/progress/ui.js +15 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/radio/methods.js +15 -7
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/integration.js +16 -11
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/methods.js +164 -12
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/scale.js +387 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/touch.js +549 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/ui.js +214 -45
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroller.js +5 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/methods.js +73 -22
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/ui.js +88 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select/methods.js +8 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/slider/methods.js +16 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/slider/ui.js +54 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/split/dividers.js +21 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/static_content.js +31 -25
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/methods.js +109 -29
- data/lib/frameworks/sproutcore/frameworks/desktop/views/button.js +10 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/checkbox.js +3 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/views/collection.js +779 -603
- data/lib/frameworks/sproutcore/frameworks/desktop/views/date_field.js +106 -7
- data/lib/frameworks/sproutcore/frameworks/desktop/views/link_view.js +406 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/views/list.js +437 -245
- data/lib/frameworks/sproutcore/frameworks/desktop/views/list_item.js +13 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_item.js +124 -62
- data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_scroll.js +176 -597
- data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_scroller_view.js +206 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/views/popup_button.js +3 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/views/progress.js +5 -4
- data/lib/frameworks/sproutcore/frameworks/desktop/views/radio.js +3 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scene.js +56 -158
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll_view.js +2560 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scroller.js +458 -242
- data/lib/frameworks/sproutcore/frameworks/desktop/views/segmented.js +117 -54
- data/lib/frameworks/sproutcore/frameworks/desktop/views/select.js +18 -12
- data/lib/frameworks/sproutcore/frameworks/desktop/views/slider.js +162 -34
- data/lib/frameworks/sproutcore/frameworks/desktop/views/split.js +30 -15
- data/lib/frameworks/sproutcore/frameworks/desktop/views/split_divider.js +33 -7
- data/lib/frameworks/sproutcore/frameworks/desktop/views/static_content.js +22 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/tab.js +47 -22
- data/lib/frameworks/sproutcore/frameworks/experimental/Buildfile +0 -6
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form_row.js +21 -21
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/ext/menu.js +14 -3
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/mixins/select_view_menu.js +24 -10
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/ext/menu_resizing.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/mixins/select_view_menu/bindings.js +7 -4
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/mixins/select_view_menu/check_selected.js +7 -9
- data/lib/frameworks/sproutcore/frameworks/{desktop/tests/panes/select_button/methods.js → experimental/frameworks/select_view/tests/views/select/method.js} +54 -76
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/tests/views/select/selected_item.js +35 -0
- data/lib/frameworks/sproutcore/frameworks/{desktop/tests/panes/select_button → experimental/frameworks/select_view/tests/views/select}/ui.js +107 -36
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/views/select.js +225 -66
- data/lib/frameworks/sproutcore/frameworks/foundation/controllers/tree.js +39 -38
- data/lib/frameworks/sproutcore/frameworks/foundation/core.js +5 -18
- data/lib/frameworks/sproutcore/frameworks/foundation/debug/control_test_pane.js +12 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/english.lproj/inflections.js +84 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/french.lproj/inflections.js +41 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_mixin.js +1 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_resize.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_display.js +3 -4
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/flowed_layout.js +6 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/private/tree_item_observer.js +408 -239
- data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/canvas_image.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/resources/text_field.css +2 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/spanish.lproj/inflections.js +38 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/system/benchmark.js +104 -76
- data/lib/frameworks/sproutcore/frameworks/foundation/system/string.js +20 -94
- data/lib/frameworks/sproutcore/frameworks/foundation/system/text_selection.js +33 -22
- data/lib/frameworks/sproutcore/frameworks/foundation/system/undo_manager.js +475 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/auto_resize_test.js +163 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/flowed_layout/tests.js +41 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/staticLayout.js +2 -5
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/methods.js +268 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/undo_manager.js +231 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/ui.js +16 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/image/ui.js +27 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/methods.js +24 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/ui.js +135 -6
- data/lib/frameworks/sproutcore/frameworks/foundation/transitions/fade_transition.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/transitions/pop_transition.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/transitions/scale_transition.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/transitions/slide_transition.js +4 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/transitions/swap_dissolve_transition.js +3 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/credit_card.js +21 -21
- data/lib/frameworks/sproutcore/frameworks/foundation/views/container.js +65 -15
- data/lib/frameworks/sproutcore/frameworks/foundation/views/image.js +4 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/views/label.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/views/text_field.js +193 -213
- data/lib/frameworks/sproutcore/frameworks/jquery/{jquery-1.8.3-patched.js → jquery-1.11.1.js} +7507 -6684
- data/lib/frameworks/sproutcore/frameworks/routing/system/routes.js +28 -11
- data/lib/frameworks/sproutcore/frameworks/routing/tests/system/routes.js +26 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/core.js +54 -25
- data/lib/frameworks/sproutcore/frameworks/runtime/ext/array.js +0 -6
- data/lib/frameworks/sproutcore/frameworks/runtime/ext/number.js +36 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/ext/window.js +25 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/array.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/enumerable.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/observable.js +156 -66
- data/lib/frameworks/sproutcore/frameworks/runtime/private/observer_set.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js +150 -65
- data/lib/frameworks/sproutcore/frameworks/runtime/system/index_set.js +57 -11
- data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js +68 -49
- data/lib/frameworks/sproutcore/frameworks/runtime/system/run_loop.js +14 -6
- data/lib/frameworks/sproutcore/frameworks/runtime/system/string.js +23 -23
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/ext/number_test.js +44 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/array.js +0 -10
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/enumerable/enumerable.js +340 -285
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/binding.js +104 -3
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/observer_set.js +14 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/string.js +15 -2
- data/lib/frameworks/sproutcore/frameworks/statechart/system/state.js +21 -18
- data/lib/frameworks/sproutcore/frameworks/statechart/system/statechart.js +52 -19
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/responder/pane.js +27 -24
- data/lib/frameworks/sproutcore/frameworks/template_view/controls/button.js +30 -0
- data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/bind.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/collection.js +2 -0
- data/lib/frameworks/sproutcore/frameworks/template_view/ext/handlebars/view.js +1 -0
- data/lib/frameworks/sproutcore/frameworks/template_view/tests/mixins/template_helpers/checkbox_support.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/template_view/tests/views/template/handlebars.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/template_view/views/bindable_span.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/template_view/views/template_collection.js +16 -14
- data/lib/frameworks/sproutcore/frameworks/testing/core.js +5 -3
- data/lib/frameworks/sproutcore/frameworks/testing/system/plan.js +13 -0
- data/lib/frameworks/sproutcore/lib/index.rhtml +2 -2
- data/lib/frameworks/sproutcore/phantomjs/test_runner.js +28 -7
- data/lib/frameworks/sproutcore/scripts/run_sc_server_master.sh +1 -1
- data/lib/frameworks/sproutcore/themes/ace/resources/_variables.css +2 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/disclosure/ace/disclosure.css +1 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/picker/popover/popover.css +3 -4
- data/lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal.css +15 -15
- data/lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal_overlay.css +74 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical.css +11 -13
- data/lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical_overlay.css +74 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob-active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob-active@2x.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/knob@2x.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/{22px → jumbo}/slider.css +9 -4
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/track.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/jumbo/track@2x.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob-active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob-active@2x.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/knob@2x.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/slider.css +32 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/track.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/regular/track@2x.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/slider.css +13 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob-active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob-active@2x.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/knob@2x.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/slider.css +32 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/track.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/small/track@2x.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/split/split.css +2 -3
- data/lib/sproutcore/builders/chance_file.rb +3 -3
- data/lib/sproutcore/helpers/minifier.rb +1 -0
- data/vendor/chance/lib/chance/instance.rb +34 -34
- data/vendor/chance/lib/chance/instance/spriting.rb +21 -16
- metadata +81 -58
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/visibility.js +0 -17
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_fast_path.js +0 -710
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/scrollable.js +0 -267
- data/lib/frameworks/sproutcore/frameworks/desktop/resources/touch-scroller.css +0 -196
- data/lib/frameworks/sproutcore/frameworks/desktop/system/undo_manager.js +0 -224
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/methods.js +0 -163
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/ui.js +0 -177
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll.js +0 -2053
- data/lib/frameworks/sproutcore/frameworks/desktop/views/select_button.js +0 -1024
- data/lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js +0 -404
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/render_delegates/menu_scroller.js +0 -28
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/tests/menu/scroll.js +0 -235
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/views/menu/scroll.js +0 -363
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/views/menu/scroller.js +0 -250
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/README.md +0 -47
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/models/record.js +0 -134
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/desktop_scroller.js +0 -92
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/native_scroll.js +0 -25
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/scroll.js +0 -33
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/render_delegates/touch_scroller.js +0 -76
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/tests/scroll/integration.js +0 -25
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/tests/scroll/methods.js +0 -143
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/tests/scroll/ui.js +0 -256
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/core_scroll.js +0 -1164
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/core_scroller.js +0 -332
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/desktop/scroll.js +0 -236
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/desktop/scroller.js +0 -347
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/scroll.js +0 -15
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/scroller.js +0 -10
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/touch/scroll.js +0 -804
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/touch/scroller.js +0 -133
- data/lib/frameworks/sproutcore/frameworks/foundation/tasks/preload_bundle.js +0 -41
- data/lib/frameworks/sproutcore/themes/ace/resources/scroller/horizontal/horizontal_touch.css +0 -91
- data/lib/frameworks/sproutcore/themes/ace/resources/scroller/vertical/vertical_touch.css +0 -92
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/14px/knob.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/14px/knob_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/14px/slider.css +0 -27
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/16px/knob.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/16px/knob_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/16px/slider.css +0 -27
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/knob.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/knob_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/22px/track.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/track.png +0 -0
data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/store_interaction_test.js
ADDED
@@ -0,0 +1,54 @@
|
|
1
|
+
// ==========================================================================
|
2
|
+
// Project: SproutCore - JavaScript Application Framework
|
3
|
+
// Copyright: ©2013 7x7 Software, Inc.
|
4
|
+
// License: Licensed under MIT license (see license.js)
|
5
|
+
// ==========================================================================
|
6
|
+
/*global module, test, equals, same */
|
7
|
+
|
8
|
+
|
9
|
+
var store, Employee, Engineer, colin;
|
10
|
+
|
11
|
+
/** Test the interaction of a polymorphic record with the store. */
|
12
|
+
module("SC.Record:Interaction with SC.Store", {
|
13
|
+
|
14
|
+
setup: function() {
|
15
|
+
SC.run(function () {
|
16
|
+
store = SC.Store.create();
|
17
|
+
|
18
|
+
Employee = SC.Record.extend({
|
19
|
+
name: SC.Record.attr(String)
|
20
|
+
});
|
21
|
+
|
22
|
+
Employee.isPolymorphic = true;
|
23
|
+
|
24
|
+
Engineer = Employee.extend({
|
25
|
+
isEngineer: YES
|
26
|
+
});
|
27
|
+
|
28
|
+
colin = store.createRecord(Engineer, { guid: 1, name: 'Colin' });
|
29
|
+
});
|
30
|
+
},
|
31
|
+
|
32
|
+
teardown: function() {
|
33
|
+
SC.run(function () {
|
34
|
+
store.destroy();
|
35
|
+
|
36
|
+
store = Employee = Engineer = colin = null;
|
37
|
+
});
|
38
|
+
}
|
39
|
+
|
40
|
+
});
|
41
|
+
|
42
|
+
test("store.replaceIdFor() should update the storeKeysById() object on the record class", function() {
|
43
|
+
var storeKey = colin.get('storeKey');
|
44
|
+
|
45
|
+
equals(Engineer.storeKeysById()['1'], storeKey, "The storeKey should be the same.");
|
46
|
+
equals(Engineer.storeKeysById()['1'], Employee.storeKeysById()['1'], "The storeKey should match at any requested polymorphic level.");
|
47
|
+
same(Engineer.storeKeysById(), Employee.storeKeysById(), "The storeKey to id mapping is actually the same instance between each polymorphic level.");
|
48
|
+
|
49
|
+
SC.Store.replaceIdFor(storeKey, 2);
|
50
|
+
|
51
|
+
equals(Engineer.storeKeysById()['2'], storeKey, "The storeKey should still be the same after replacing the id.");
|
52
|
+
equals(Engineer.storeKeysById()['2'], Employee.storeKeysById()['2'], "The storeKey should still match at any requested polymorphic level after replacing the id.");
|
53
|
+
same(Engineer.storeKeysById(), Employee.storeKeysById(), "The storeKey to id mapping is actually the same instance between each polymorphic level.");
|
54
|
+
});
|
data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/datetime_recordattribute.js
CHANGED
@@ -10,45 +10,52 @@
|
|
10
10
|
// framework might not be the best place for it but it works because the
|
11
11
|
// desktop framework requires both datestore and foundation frameworks.
|
12
12
|
|
13
|
-
var sprocket, nullSprocket, d1, d2, d3;
|
13
|
+
var sprocket, nullSprocket, nullUnixTime, d1, d2, d3;
|
14
14
|
|
15
15
|
module('SC.DateTime transform', {
|
16
16
|
|
17
17
|
setup: function() {
|
18
|
-
|
18
|
+
|
19
19
|
d1 = SC.DateTime.create({ year: 2009, month: 3, day: 1, hour: 20, minute: 30, timezone: 480 });
|
20
20
|
d2 = SC.DateTime.create({ year: 2009, month: 3, day: 1, hour: 20, minute: 30, timezone: SC.DateTime.timezone });
|
21
21
|
d3 = SC.DateTime.create({ year: 2009, month: 3, day: 1, hour: 20, minute: 30, timezone: 0 });
|
22
|
-
|
22
|
+
|
23
23
|
var MyApp = SC.Object.create({
|
24
24
|
store: SC.Store.create()
|
25
25
|
});
|
26
|
-
|
26
|
+
|
27
27
|
MyApp.Sprocket = SC.Record.extend({
|
28
28
|
createdAt: SC.Record.attr(SC.DateTime),
|
29
29
|
frenchCreatedAt: SC.Record.attr(SC.DateTime, { format: '%d/%m/%Y %H:%M:%S' }),
|
30
30
|
unixTimeCreatedAt: SC.Record.attr(SC.DateTime, { useUnixTime: YES })
|
31
31
|
});
|
32
|
-
|
32
|
+
|
33
33
|
SC.RunLoop.begin();
|
34
34
|
MyApp.store.loadRecords(MyApp.Sprocket, [
|
35
|
-
{
|
36
|
-
guid: '1',
|
35
|
+
{
|
36
|
+
guid: '1',
|
37
37
|
createdAt: '2009-03-01T20:30:00-08:00',
|
38
38
|
frenchCreatedAt: '01/03/2009 20:30:00',
|
39
39
|
unixTimeCreatedAt: 1235939400
|
40
40
|
},
|
41
|
-
{
|
42
|
-
guid: '2',
|
41
|
+
{
|
42
|
+
guid: '2',
|
43
43
|
createdAt: null,
|
44
44
|
frenchCreatedAt: null,
|
45
45
|
unixTimeCreatedAt: 'invalidValue'
|
46
|
+
},
|
47
|
+
{
|
48
|
+
guid: '3',
|
49
|
+
createdAt: null,
|
50
|
+
frenchCreatedAt: null,
|
51
|
+
unixTimeCreatedAt: null
|
46
52
|
}
|
47
53
|
]);
|
48
54
|
SC.RunLoop.end();
|
49
|
-
|
55
|
+
|
50
56
|
sprocket = MyApp.store.find(MyApp.Sprocket, '1');
|
51
57
|
nullSprocket = MyApp.store.find(MyApp.Sprocket, '2');
|
58
|
+
nullUnixTime = MyApp.store.find(MyApp.Sprocket, '3');
|
52
59
|
}
|
53
60
|
|
54
61
|
});
|
@@ -61,25 +68,26 @@ test("reading a DateTime should successfully parse the underlying string value",
|
|
61
68
|
test("writing a DateTime should successfully format the value into a string", function() {
|
62
69
|
d1 = d1.advance({ year: 1, hour: 2, minute: 28 });
|
63
70
|
d2 = d2.advance({ month: -2, minute: 16 });
|
64
|
-
|
71
|
+
|
65
72
|
sprocket.set('createdAt', d1);
|
66
73
|
sprocket.set('frenchCreatedAt', d2);
|
67
|
-
|
74
|
+
|
68
75
|
equals(sprocket.readAttribute('createdAt'), '2010-03-01T22:58:00-08:00', 'writing a DateTime should successfully format the value into the a string');
|
69
76
|
equals(sprocket.readAttribute('frenchCreatedAt'), '01/01/2009 20:46:00', 'writing a DateTime with a custom format should successfully format the value into the a string');
|
70
77
|
});
|
71
78
|
|
72
79
|
test("reading or writing null values should work", function() {
|
73
80
|
sprocket.set('createdAt', null);
|
74
|
-
equals(sprocket.readAttribute('createdAt'), null);
|
75
|
-
|
76
|
-
equals(nullSprocket.get('createdAt'), null);
|
81
|
+
equals(sprocket.readAttribute('createdAt'), null, 'Setting a date attribute to null should work');
|
82
|
+
|
83
|
+
equals(nullSprocket.get('createdAt'), null, 'Reading a null date attribute should work');
|
84
|
+
equals(nullUnixTime.get('unixTimeCreatedAt'), null, 'Reading a null date attribute with useUnixTime: YES should work');
|
77
85
|
});
|
78
86
|
|
79
87
|
test("reading and writing a DateTime should successfully convert to/from unix time", function() {
|
80
88
|
// Reading test
|
81
89
|
equals(sprocket.get('unixTimeCreatedAt'), d3, 'reading a DateTime stored in unix time format should return the correct SC.DateTime object');
|
82
|
-
|
90
|
+
|
83
91
|
// Writing test
|
84
92
|
d3 = d3.advance({ year: 2, month: 7, day: 14, hour: -3 });
|
85
93
|
sprocket.set('unixTimeCreatedAt', d3);
|
@@ -33,7 +33,9 @@ module("SC.ManyAttribute core methods", {
|
|
33
33
|
}),
|
34
34
|
|
35
35
|
// test toMany relationships
|
36
|
-
fooMany: SC.Record.toMany('MyApp.Foo'
|
36
|
+
fooMany: SC.Record.toMany('MyApp.Foo', {
|
37
|
+
supportNewRecords: false
|
38
|
+
}),
|
37
39
|
|
38
40
|
// test toMany relationships with different key
|
39
41
|
fooManyKeyed: SC.Record.toMany('MyApp.Foo', {
|
@@ -56,7 +58,8 @@ module("SC.ManyAttribute core methods", {
|
|
56
58
|
|
57
59
|
// test many-to-many
|
58
60
|
fooToMany: SC.Record.toMany('MyApp.Foo', {
|
59
|
-
inverse: 'barToMany', isMaster: NO
|
61
|
+
inverse: 'barToMany', isMaster: NO,
|
62
|
+
supportNewRecords: false
|
60
63
|
}),
|
61
64
|
|
62
65
|
// test many-to-one
|
@@ -294,7 +297,7 @@ test("should be able to modify an initially empty record", function() {
|
|
294
297
|
});
|
295
298
|
|
296
299
|
|
297
|
-
test("Adding an unsaved record should throw an Error", function() {
|
300
|
+
test("Adding an unsaved record should throw an Error is supportNewRecords is false", function() {
|
298
301
|
var foo;
|
299
302
|
|
300
303
|
SC.run(function () {
|
data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/data_store.js
CHANGED
@@ -30,12 +30,13 @@ var initModels = function () {
|
|
30
30
|
module("Data Store Tests for Nested Records", {
|
31
31
|
|
32
32
|
setup: function () {
|
33
|
+
SC.RunLoop.begin();
|
33
34
|
NestedRecord = SC.Object.create({
|
34
35
|
store: SC.Store.create()
|
35
36
|
});
|
36
37
|
store = NestedRecord.store;
|
37
38
|
initModels();
|
38
|
-
|
39
|
+
|
39
40
|
storeKeys = store.loadRecords([NestedRecord.Directory, NestedRecord.File], [
|
40
41
|
{
|
41
42
|
type: 'Directory',
|
@@ -82,50 +83,94 @@ test("Proper Initialization", function () {
|
|
82
83
|
var first, second;
|
83
84
|
equals(storeKeys.get('length'), 2, "number of primary store keys should be 2");
|
84
85
|
|
86
|
+
|
85
87
|
// First
|
86
|
-
first = store.materializeRecord(storeKeys[0]);
|
88
|
+
SC.run(function() { first = store.materializeRecord(storeKeys[0]); });
|
87
89
|
ok(SC.kindOf(first, SC.Record), "first record is a kind of a SC.Record Object");
|
88
90
|
ok(SC.instanceOf(first, NestedRecord.Directory), "first record is a instance of a NestedRecord.Directory Object");
|
89
91
|
|
90
92
|
// Second
|
91
|
-
second = store.materializeRecord(storeKeys[1]);
|
93
|
+
SC.run(function() { second = store.materializeRecord(storeKeys[1]); });
|
92
94
|
ok(SC.kindOf(second, SC.Record), "second record is a kind of a SC.Record Object");
|
93
95
|
ok(SC.instanceOf(second, NestedRecord.File), "second record is a instance of a NestedRecord.File Object");
|
94
96
|
});
|
95
97
|
|
98
|
+
test("Test that reset() clears out the store for re-use", function () {
|
99
|
+
var isEmptyObject = function ( obj ) {
|
100
|
+
var name;
|
101
|
+
|
102
|
+
for (name in obj) {
|
103
|
+
return false;
|
104
|
+
}
|
105
|
+
return true;
|
106
|
+
};
|
107
|
+
|
108
|
+
var parent, child;
|
109
|
+
SC.run(function() { parent = store.materializeRecord(storeKeys[0]); });
|
110
|
+
SC.run(function() { child = parent.get('contents').firstObject(); });
|
111
|
+
|
112
|
+
ok(!isEmptyObject(store.parentRecords), "We expect there to be values in store.parentRecords");
|
113
|
+
ok(!isEmptyObject(store.childRecords), "We expect there to be values in store.childRecords");
|
114
|
+
|
115
|
+
store.reset();
|
116
|
+
|
117
|
+
ok(isEmptyObject(store.parentRecords), "We expect there to no longer be any values in store.parentRecords");
|
118
|
+
ok(isEmptyObject(store.childRecords), "We expect there to no longer be any values in store.childRecords");
|
119
|
+
});
|
120
|
+
|
96
121
|
test("Proper Status", function () {
|
97
122
|
var first, second;
|
98
123
|
|
99
124
|
// First
|
100
|
-
first = store.materializeRecord(storeKeys[0]);
|
125
|
+
SC.run(function() { first = store.materializeRecord(storeKeys[0]); });
|
101
126
|
equals(first.get('status'), SC.Record.READY_CLEAN, 'first record has a READY_CLEAN State');
|
102
127
|
|
103
128
|
// Second
|
104
|
-
second = store.materializeRecord(storeKeys[1]);
|
129
|
+
SC.run(function() { second = store.materializeRecord(storeKeys[1]); });
|
105
130
|
equals(second.get('status'), SC.Record.READY_CLEAN, 'second record has a READY_CLEAN State');
|
131
|
+
|
132
|
+
// Shallow property update.
|
133
|
+
SC.run(function() { first.get('contents').objectAt(0).set('name', 'Dir 2 - Updated') });
|
134
|
+
equals(first.get('status'), SC.Record.READY_DIRTY, 'first record has a READY_DIRTY State');
|
135
|
+
});
|
136
|
+
|
137
|
+
test("Deep property update", function () {
|
138
|
+
var first, second;
|
139
|
+
|
140
|
+
// First
|
141
|
+
SC.run(function() { first = store.materializeRecord(storeKeys[0]); });
|
142
|
+
equals(first.get('status'), SC.Record.READY_CLEAN, 'first record has a READY_CLEAN State');
|
143
|
+
|
144
|
+
// Deep property update.
|
145
|
+
SC.run(function() { first.get('contents').objectAt(0).get('contents').objectAt(0).set('name', 'Dir 2 - Updated') });
|
146
|
+
equals(first.get('status'), SC.Record.READY_DIRTY, 'first record has a READY_DIRTY State');
|
106
147
|
});
|
107
148
|
|
108
149
|
test("Can Push onto child array", function () {
|
109
150
|
var first, contents;
|
110
151
|
|
111
152
|
// First
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
contents.forEach(function (f) {
|
117
|
-
ok(SC.instanceOf(f, NestedRecord.File), "should be a NestedRecord.File");
|
118
|
-
ok(f.get('name'), "should have a name property");
|
119
|
-
});
|
153
|
+
SC.run(function() {
|
154
|
+
first = store.materializeRecord(storeKeys[0]);
|
155
|
+
first = first.get('contents').objectAt(0);
|
156
|
+
contents = first.get('contents');
|
120
157
|
|
121
|
-
|
158
|
+
equals(contents.get('length'), 2, "should have two items");
|
122
159
|
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
160
|
+
contents.forEach(function (f) {
|
161
|
+
ok(SC.instanceOf(f, NestedRecord.File), "should be a NestedRecord.File");
|
162
|
+
ok(f.get('name'), "should have a name property");
|
163
|
+
});
|
164
|
+
|
165
|
+
contents.pushObject({type: 'File', name: 'File 4', id: 12});
|
166
|
+
|
167
|
+
equals(contents.get('length'), 3, "should have three items");
|
128
168
|
|
169
|
+
contents.forEach(function (f) {
|
170
|
+
ok(SC.instanceOf(f, NestedRecord.File), "should be a NestedRecord.File");
|
171
|
+
ok(f.get('name'), "should have a name property");
|
172
|
+
equals(f.get('status'), SC.Record.READY_DIRTY, 'second record has a READY_DIRTY State');
|
173
|
+
});
|
129
174
|
});
|
130
175
|
|
131
176
|
});
|
@@ -135,17 +180,17 @@ test("Use in Nested Store", function () {
|
|
135
180
|
pk, id, nFile, nDir;
|
136
181
|
|
137
182
|
// First, find the first file
|
138
|
-
dir = store.find(NestedRecord.Directory, 1);
|
183
|
+
SC.run(function() { dir = store.find(NestedRecord.Directory, 1); });
|
139
184
|
ok(dir, "Directory id:1 exists");
|
140
185
|
equals(dir.get('name'), 'Dir 1', "Directory id:1 has a name of 'Dir 1'");
|
141
186
|
c = dir.get('contents');
|
142
187
|
ok(c, "Content of Directory id:1 exists");
|
143
|
-
dir = c.objectAt(0);
|
188
|
+
SC.run(function() {dir = c.objectAt(0);});
|
144
189
|
ok(dir, "Directory id:2 exists");
|
145
190
|
equals(dir.get('name'), 'Dir 2', "Directory id:2 has a name of 'Dir 2'");
|
146
191
|
c = dir.get('contents');
|
147
192
|
ok(c, "Content of Directory id:2 exists");
|
148
|
-
file = c.objectAt(0);
|
193
|
+
SC.run(function() {file = c.objectAt(0);});
|
149
194
|
ok(file, "File id:1 exists");
|
150
195
|
equals(file.get('name'), 'File 1', "File id:1 has a name of 'File 1'");
|
151
196
|
|
@@ -160,20 +205,24 @@ test("Use in Nested Store", function () {
|
|
160
205
|
equals(nFile.get('name'), 'File 1', "Nested > File id:1 has a name of 'File 1'");
|
161
206
|
|
162
207
|
// Third, change the name of the nested store and see what happens
|
163
|
-
nFile.set('name', 'Change Name');
|
208
|
+
SC.run(function(){nFile.set('name', 'Change Name');});
|
164
209
|
equals(nFile.get('name'), 'Change Name', "Nested > File id:1 has changed the name to 'Changed Name'");
|
165
210
|
equals(file.get('name'), 'File 1', "Base > File id:1 still has the name of 'File 1'");
|
166
211
|
nDir = nstore.find(NestedRecord.Directory, 1);
|
167
212
|
|
168
213
|
// Fourth, commit the changes
|
169
|
-
|
170
|
-
|
214
|
+
SC.run(function(){
|
215
|
+
nstore.commitChanges();
|
216
|
+
nstore.destroy();
|
217
|
+
});
|
171
218
|
nstore = null;
|
172
219
|
equals(file.get('name'), 'Change Name', "Base > File id:1 has changed to name of 'Changed Name'");
|
173
220
|
|
174
221
|
// Fifth, double check that the change exists
|
175
222
|
dir = store.find(NestedRecord.Directory, 1);
|
176
|
-
|
223
|
+
SC.run(function() {
|
224
|
+
file = dir.get('contents').objectAt(0).get('contents').objectAt(0);
|
225
|
+
});
|
177
226
|
equals(dir.get('status'), SC.Record.READY_DIRTY, 'Base > Directory id:1 has a READY_DIRTY State');
|
178
227
|
equals(file.get('status'), SC.Record.READY_DIRTY, 'Base > File id:1 has a READY_DIRTY State');
|
179
228
|
equals(file.get('name'), 'Change Name', "Base > File id:1 has actually changed to name of 'Changed Name'");
|
@@ -181,7 +230,9 @@ test("Use in Nested Store", function () {
|
|
181
230
|
});
|
182
231
|
|
183
232
|
test("Store#pushRetrieve for parent updates the child records", function () {
|
184
|
-
|
233
|
+
SC.RunLoop.begin()
|
234
|
+
var parent = store.materializeRecord(storeKeys[0]),
|
235
|
+
nr = parent.get('contents').firstObject(),
|
185
236
|
newDataHash = {
|
186
237
|
type: 'Directory',
|
187
238
|
name: 'Dir 1 Changed',
|
@@ -207,18 +258,199 @@ test("Store#pushRetrieve for parent updates the child records", function () {
|
|
207
258
|
]
|
208
259
|
};
|
209
260
|
|
210
|
-
|
211
|
-
|
212
|
-
nr = parent.get('contents').firstObject();
|
213
|
-
});
|
261
|
+
parent = store.materializeRecord(storeKeys[0]);
|
262
|
+
nr = parent.get('contents').get('firstObject');
|
214
263
|
|
215
264
|
ok(nr, "Got nested record");
|
216
265
|
equals(nr.get('name'), 'Dir 2', "Dir id:2 has correct name");
|
217
266
|
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
267
|
+
store.pushRetrieve(null, null, newDataHash, storeKeys[0]);
|
268
|
+
store.flush();
|
269
|
+
SC.RunLoop.end()
|
270
|
+
|
222
271
|
equals(parent.get('name'), 'Dir 1 Changed', 'Dir id:1 name was changed');
|
223
272
|
equals(nr.get('name'), 'Dir 2 Changed', "Dir id:2 name was changed");
|
224
273
|
});
|
274
|
+
|
275
|
+
test("Store#pushRetrieve for parent updates the child records, even on different path", function () {
|
276
|
+
SC.RunLoop.begin()
|
277
|
+
var parent = store.materializeRecord(storeKeys[0]),
|
278
|
+
nr = parent.get('contents').firstObject(),
|
279
|
+
newDataHash = {
|
280
|
+
type: 'Directory',
|
281
|
+
name: 'Dir 1 Changed',
|
282
|
+
guid: 1,
|
283
|
+
contents: [
|
284
|
+
{
|
285
|
+
type: 'Directory',
|
286
|
+
name: 'Dir 3',
|
287
|
+
guid: 5,
|
288
|
+
contents: [
|
289
|
+
{
|
290
|
+
type: 'File',
|
291
|
+
guid: 6,
|
292
|
+
name: 'File 6'
|
293
|
+
},
|
294
|
+
{
|
295
|
+
type: 'File',
|
296
|
+
guid: 7,
|
297
|
+
name: 'File 7'
|
298
|
+
}
|
299
|
+
]
|
300
|
+
},
|
301
|
+
{
|
302
|
+
type: 'Directory',
|
303
|
+
name: 'Dir 2 Changed',
|
304
|
+
guid: 2,
|
305
|
+
contents: [
|
306
|
+
{
|
307
|
+
type: 'File',
|
308
|
+
guid: 3,
|
309
|
+
name: 'File 1'
|
310
|
+
},
|
311
|
+
{
|
312
|
+
type: 'File',
|
313
|
+
guid: 4,
|
314
|
+
name: 'File 2'
|
315
|
+
}
|
316
|
+
]
|
317
|
+
}
|
318
|
+
]
|
319
|
+
};
|
320
|
+
|
321
|
+
parent = store.materializeRecord(storeKeys[0]);
|
322
|
+
nr = store.find(NestedRecord.Directory,2);
|
323
|
+
|
324
|
+
ok(nr, "Got nested record");
|
325
|
+
equals(nr.get('name'), 'Dir 2', "Dir id:2 has correct name");
|
326
|
+
|
327
|
+
store.pushRetrieve(null, null, newDataHash, storeKeys[0]);
|
328
|
+
store.flush();
|
329
|
+
SC.RunLoop.end()
|
330
|
+
|
331
|
+
equals(parent.get('name'), 'Dir 1 Changed', 'Dir id:1 name was changed');
|
332
|
+
equals(nr.get('name'), 'Dir 2 Changed', "Dir id:2 name has changed");
|
333
|
+
});
|
334
|
+
|
335
|
+
test("Store#pushRetrieve for parent updates the child records, works on first object", function () {
|
336
|
+
SC.RunLoop.begin()
|
337
|
+
var parent = store.materializeRecord(storeKeys[0]),
|
338
|
+
nr = parent.get('contents').firstObject(),
|
339
|
+
newDataHash = {
|
340
|
+
type: 'Directory',
|
341
|
+
name: 'Dir 1 Changed',
|
342
|
+
guid: 1,
|
343
|
+
contents: [
|
344
|
+
{
|
345
|
+
type: 'Directory',
|
346
|
+
name: 'Dir 3',
|
347
|
+
guid: 5,
|
348
|
+
contents: [
|
349
|
+
{
|
350
|
+
type: 'File',
|
351
|
+
guid: 6,
|
352
|
+
name: 'File 6'
|
353
|
+
},
|
354
|
+
{
|
355
|
+
type: 'File',
|
356
|
+
guid: 7,
|
357
|
+
name: 'File 7'
|
358
|
+
}
|
359
|
+
]
|
360
|
+
},
|
361
|
+
{
|
362
|
+
type: 'Directory',
|
363
|
+
name: 'Dir 2 Changed',
|
364
|
+
guid: 2,
|
365
|
+
contents: [
|
366
|
+
{
|
367
|
+
type: 'File',
|
368
|
+
guid: 3,
|
369
|
+
name: 'File 1'
|
370
|
+
},
|
371
|
+
{
|
372
|
+
type: 'File',
|
373
|
+
guid: 4,
|
374
|
+
name: 'File 2'
|
375
|
+
}
|
376
|
+
]
|
377
|
+
}
|
378
|
+
]
|
379
|
+
};
|
380
|
+
|
381
|
+
parent = store.materializeRecord(storeKeys[0]);
|
382
|
+
nr = parent.get('contents').firstObject();
|
383
|
+
|
384
|
+
ok(nr, "Got nested record");
|
385
|
+
equals(nr.get('name'), 'Dir 2', "Dir id:2 has correct name");
|
386
|
+
|
387
|
+
store.pushRetrieve(null, null, newDataHash, storeKeys[0]);
|
388
|
+
store.flush();
|
389
|
+
SC.RunLoop.end()
|
390
|
+
|
391
|
+
equals(parent.get('name'), 'Dir 1 Changed', 'Dir id:1 name was changed');
|
392
|
+
equals(nr.get('name'), 'Dir 2 Changed', "First object name has changed");
|
393
|
+
});
|
394
|
+
|
395
|
+
test("Store#pushRetrieve for parent updates the child records, on paths nested more than 2 levels", function () {
|
396
|
+
SC.RunLoop.begin()
|
397
|
+
var parent = store.materializeRecord(storeKeys[0]),
|
398
|
+
nr = parent.get('contents').firstObject().get('contents').firstObject(),
|
399
|
+
newDataHash = {
|
400
|
+
type: 'Directory',
|
401
|
+
name: 'Dir 1 Changed',
|
402
|
+
guid: 1,
|
403
|
+
contents: [
|
404
|
+
{
|
405
|
+
type: 'Directory',
|
406
|
+
name: 'Dir 3',
|
407
|
+
guid: 5,
|
408
|
+
contents: [
|
409
|
+
{
|
410
|
+
type: 'File',
|
411
|
+
guid: 6,
|
412
|
+
name: 'File 6'
|
413
|
+
},
|
414
|
+
{
|
415
|
+
type: 'File',
|
416
|
+
guid: 7,
|
417
|
+
name: 'File 7'
|
418
|
+
}
|
419
|
+
]
|
420
|
+
},
|
421
|
+
{
|
422
|
+
type: 'Directory',
|
423
|
+
name: 'Dir 2 Changed',
|
424
|
+
guid: 2,
|
425
|
+
contents: [
|
426
|
+
{
|
427
|
+
type: 'File',
|
428
|
+
guid: 3,
|
429
|
+
name: 'File 1 Changed'
|
430
|
+
},
|
431
|
+
{
|
432
|
+
type: 'File',
|
433
|
+
guid: 4,
|
434
|
+
name: 'File 2'
|
435
|
+
}
|
436
|
+
]
|
437
|
+
}
|
438
|
+
]
|
439
|
+
};
|
440
|
+
|
441
|
+
ok(nr, "(deep walk) Got nested record");
|
442
|
+
equals(nr.get('name'), 'File 1', "(deep walk) File id:3 has correct name");
|
443
|
+
|
444
|
+
parent = store.materializeRecord(storeKeys[0]);
|
445
|
+
nr = store.find(NestedRecord.File,3);
|
446
|
+
|
447
|
+
ok(nr, "Got nested record");
|
448
|
+
equals(nr.get('name'), 'File 1', "File id:3 has correct name");
|
449
|
+
|
450
|
+
store.pushRetrieve(null, null, newDataHash, storeKeys[0]);
|
451
|
+
store.flush();
|
452
|
+
SC.RunLoop.end()
|
453
|
+
|
454
|
+
equals(parent.get('name'), 'Dir 1 Changed', 'Dir id:1 name was changed');
|
455
|
+
equals(nr.get('name'), 'File 1 Changed', "File id:3 name has changed");
|
456
|
+
});
|