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
@@ -31,7 +31,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
31
31
|
var readOnlyStoreIds = this.get('readOnlyStoreIds'),
|
32
32
|
length = this.get('length');
|
33
33
|
|
34
|
-
return "%@({\n
|
34
|
+
return "%@({\n ids: [%@],\n length: %@,\n … })".fmt(sc_super(), readOnlyStoreIds, length);
|
35
35
|
},
|
36
36
|
|
37
37
|
/* END DEBUG ONLY PROPERTIES AND METHODS */
|
@@ -80,7 +80,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
80
80
|
@type SC.Store
|
81
81
|
@property
|
82
82
|
*/
|
83
|
-
store: function() {
|
83
|
+
store: function () {
|
84
84
|
return this.get('record').get('store');
|
85
85
|
}.property('record').cacheable(),
|
86
86
|
|
@@ -91,10 +91,28 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
91
91
|
@type Number
|
92
92
|
@property
|
93
93
|
*/
|
94
|
-
storeKey: function() {
|
94
|
+
storeKey: function () {
|
95
95
|
return this.get('record').get('storeKey');
|
96
96
|
}.property('record').cacheable(),
|
97
97
|
|
98
|
+
/**
|
99
|
+
Determines whether the new record (i.e. unsaved) support should be enabled
|
100
|
+
or not.
|
101
|
+
|
102
|
+
Normally, all records in the many array should already have been previously
|
103
|
+
committed to a remote data store and have an actual `id`. However, with
|
104
|
+
`supportNewRecords` set to true, adding records without an `id `to the many
|
105
|
+
array will assign unique temporary ids to the new records.
|
106
|
+
|
107
|
+
*Note:* You must update the many array after the new records are successfully
|
108
|
+
committed and have real ids. This is done by calling `updateNewRecordId()`
|
109
|
+
on the many array. In the future this should be automatic.
|
110
|
+
|
111
|
+
@type Boolean
|
112
|
+
@default false
|
113
|
+
@since SproutCore 1.11.0
|
114
|
+
*/
|
115
|
+
supportNewRecords: NO,
|
98
116
|
|
99
117
|
/**
|
100
118
|
Returns the `storeId`s in read-only mode. Avoids modifying the record
|
@@ -103,7 +121,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
103
121
|
@type SC.Array
|
104
122
|
@property
|
105
123
|
*/
|
106
|
-
readOnlyStoreIds: function() {
|
124
|
+
readOnlyStoreIds: function () {
|
107
125
|
return this.get('record').readAttribute(this.get('propertyName'));
|
108
126
|
}.property(),
|
109
127
|
|
@@ -115,7 +133,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
115
133
|
@type {SC.Array}
|
116
134
|
@property
|
117
135
|
*/
|
118
|
-
editableStoreIds: function() {
|
136
|
+
editableStoreIds: function () {
|
119
137
|
var store = this.get('store'),
|
120
138
|
storeKey = this.get('storeKey'),
|
121
139
|
pname = this.get('propertyName'),
|
@@ -127,8 +145,8 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
127
145
|
ret = hash[pname] = [];
|
128
146
|
}
|
129
147
|
|
130
|
-
if (ret !== this.
|
131
|
-
return ret
|
148
|
+
// if (ret !== this._sc_prevStoreIds) this.recordPropertyDidChange();
|
149
|
+
return ret;
|
132
150
|
}.property(),
|
133
151
|
|
134
152
|
|
@@ -142,7 +160,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
142
160
|
@type Boolean
|
143
161
|
@property
|
144
162
|
*/
|
145
|
-
isEditable: function() {
|
163
|
+
isEditable: function () {
|
146
164
|
// NOTE: can't use get() b/c manyAttribute looks like a computed prop
|
147
165
|
var attr = this.manyAttribute;
|
148
166
|
return attr ? attr.get('isEditable') : NO;
|
@@ -154,7 +172,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
154
172
|
@type String
|
155
173
|
@property
|
156
174
|
*/
|
157
|
-
inverse: function() {
|
175
|
+
inverse: function () {
|
158
176
|
// NOTE: can't use get() b/c manyAttribute looks like a computed prop
|
159
177
|
var attr = this.manyAttribute;
|
160
178
|
return attr ? attr.get('inverse') : null;
|
@@ -166,7 +184,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
166
184
|
@type Boolean
|
167
185
|
@property
|
168
186
|
*/
|
169
|
-
isMaster: function() {
|
187
|
+
isMaster: function () {
|
170
188
|
// NOTE: can't use get() b/c manyAttribute looks like a computed prop
|
171
189
|
var attr = this.manyAttribute;
|
172
190
|
return attr ? attr.get('isMaster') : null;
|
@@ -178,7 +196,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
178
196
|
@type Array
|
179
197
|
@property
|
180
198
|
*/
|
181
|
-
orderBy: function() {
|
199
|
+
orderBy: function () {
|
182
200
|
// NOTE: can't use get() b/c manyAttribute looks like a computed prop
|
183
201
|
var attr = this.manyAttribute;
|
184
202
|
return attr ? attr.get('orderBy') : null;
|
@@ -194,7 +212,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
194
212
|
@type Number
|
195
213
|
@property
|
196
214
|
*/
|
197
|
-
length: function() {
|
215
|
+
length: function () {
|
198
216
|
var storeIds = this.get('readOnlyStoreIds');
|
199
217
|
return storeIds ? storeIds.get('length') : 0;
|
200
218
|
}.property('readOnlyStoreIds'),
|
@@ -203,39 +221,47 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
203
221
|
Looks up the store id in the store ids array and materializes a
|
204
222
|
records.
|
205
223
|
*/
|
206
|
-
objectAt: function(idx) {
|
207
|
-
var recs
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
224
|
+
objectAt: function (idx) {
|
225
|
+
var recs = this._records,
|
226
|
+
storeIds = this.get('readOnlyStoreIds'),
|
227
|
+
store = this.get('store'),
|
228
|
+
recordType = this.get('recordType'),
|
229
|
+
len = storeIds ? storeIds.length : 0,
|
230
|
+
storeKey, ret, storeId;
|
212
231
|
|
213
232
|
if (!storeIds || !store) return undefined; // nothing to do
|
214
|
-
if (recs && (ret=recs[idx])) return ret
|
233
|
+
if (recs && (ret = recs[idx])) return ret; // cached
|
215
234
|
|
216
|
-
// not
|
217
|
-
if (
|
235
|
+
// If not a good index return undefined
|
236
|
+
if (idx >= len) return undefined;
|
218
237
|
storeId = storeIds.objectAt(idx);
|
219
|
-
if (storeId)
|
238
|
+
if (!storeId) return undefined;
|
220
239
|
|
221
|
-
|
222
|
-
|
223
|
-
storeKey = store.storeKeyFor(recordType, storeId);
|
240
|
+
// not in cache, materialize
|
241
|
+
if (!recs) this._records = recs = []; // create cache
|
224
242
|
|
225
|
-
|
226
|
-
|
227
|
-
|
243
|
+
// Handle transient records.
|
244
|
+
if (typeof storeId === SC.T_STRING && storeId.indexOf('_sc_id_placeholder_') === 0) {
|
245
|
+
storeKey = storeId.replace('_sc_id_placeholder_', '');
|
246
|
+
} else {
|
247
|
+
storeKey = store.storeKeyFor(recordType, storeId);
|
248
|
+
}
|
228
249
|
|
229
|
-
|
250
|
+
// If record is not loaded already, then ask the data source to retrieve it.
|
251
|
+
if (store.readStatus(storeKey) === SC.Record.EMPTY) {
|
252
|
+
store.retrieveRecord(recordType, null, storeKey);
|
230
253
|
}
|
231
|
-
|
254
|
+
|
255
|
+
recs[idx] = ret = store.materializeRecord(storeKey);
|
256
|
+
|
257
|
+
return ret;
|
232
258
|
},
|
233
259
|
|
234
260
|
/** @private
|
235
261
|
Pass through to the underlying array. The passed in objects must be
|
236
262
|
records, which can be converted to `storeId`s.
|
237
263
|
*/
|
238
|
-
replace: function(idx, amt, recs) {
|
264
|
+
replace: function (idx, amt, recs) {
|
239
265
|
//@if(debug)
|
240
266
|
if (!this.get('isEditable')) {
|
241
267
|
throw new Error("Developer Error: %@.%@[] is not editable.".fmt(this.get('record'), this.get('propertyName')));
|
@@ -243,47 +269,73 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
243
269
|
//@endif
|
244
270
|
|
245
271
|
var storeIds = this.get('editableStoreIds'),
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
272
|
+
recsLen = recs ? (recs.get ? recs.get('length') : recs.length) : 0,
|
273
|
+
parent = this.get('record'),
|
274
|
+
pname = this.get('propertyName'),
|
275
|
+
supportNewRecords = this.get('supportNewRecords'),
|
276
|
+
ids, toRemove, inverse, attr, inverseRecord,
|
277
|
+
i;
|
278
|
+
|
279
|
+
// Create the cache, we will need it.
|
280
|
+
if (!this._records) this._records = [];
|
250
281
|
|
251
282
|
// map to store keys
|
252
|
-
ids = []
|
253
|
-
for(i=0;i<
|
254
|
-
|
255
|
-
|
256
|
-
|
283
|
+
ids = [];
|
284
|
+
for (i = 0; i < recsLen; i++) {
|
285
|
+
var rec = recs.objectAt(i),
|
286
|
+
id = rec.get('id');
|
287
|
+
|
288
|
+
if (SC.none(id)) {
|
289
|
+
// If the record inserted doesn't have an id yet, use a unique placeholder based on the storeKey.
|
290
|
+
if (supportNewRecords) {
|
291
|
+
ids[i] = '_sc_id_placeholder_' + rec.get('storeKey');
|
292
|
+
} else {
|
293
|
+
throw new Error("Developer Error: Attempted to add a record without a primary key to a to-many relationship (%@). The record must have a real id or be given a temporary id before it can be used. ".fmt(pname));
|
294
|
+
}
|
295
|
+
} else {
|
296
|
+
ids[i] = id;
|
257
297
|
}
|
258
|
-
//@endif
|
259
|
-
|
260
|
-
ids[i] = recs.objectAt(i).get('id');
|
261
298
|
}
|
262
299
|
|
263
300
|
// if we have an inverse - collect the list of records we are about to
|
264
301
|
// remove
|
265
302
|
inverse = this.get('inverse');
|
266
303
|
if (inverse && amt > 0) {
|
304
|
+
// Use a shared array to save on processing.
|
267
305
|
toRemove = SC.ManyArray._toRemove;
|
268
306
|
if (toRemove) SC.ManyArray._toRemove = null; // reuse if possible
|
269
307
|
else toRemove = [];
|
270
308
|
|
271
|
-
for(i=0;i<amt;i++)
|
309
|
+
for (i = 0; i < amt; i++) {
|
310
|
+
toRemove[i] = this.objectAt(idx + i);
|
311
|
+
}
|
272
312
|
}
|
273
313
|
|
274
|
-
//
|
275
|
-
|
314
|
+
// Notify that the content will change.
|
315
|
+
this.arrayContentWillChange(idx, amt, recsLen);
|
316
|
+
|
317
|
+
// Perform a raw array replace without any KVO checks.
|
318
|
+
// NOTE: the cache must be updated to mirror changes to the storeIds
|
319
|
+
if (ids.length === 0) {
|
320
|
+
storeIds.splice(idx, amt);
|
321
|
+
this._records.splice(idx, amt);
|
322
|
+
} else {
|
323
|
+
var args = [idx, amt].concat(ids);
|
324
|
+
storeIds.splice.apply(storeIds, args);
|
325
|
+
args = [idx, amt].concat(new Array(ids.length)); // Insert empty items into the cache
|
326
|
+
this._records.splice.apply(this._records, args);
|
327
|
+
}
|
276
328
|
|
277
329
|
// ok, notify records that were removed then added; this way reordered
|
278
330
|
// objects are added and removed
|
279
331
|
if (inverse) {
|
280
332
|
|
281
333
|
// notify removals
|
282
|
-
for(i=0;i<amt;i++) {
|
334
|
+
for (i = 0; i < amt; i++) {
|
283
335
|
inverseRecord = toRemove[i];
|
284
336
|
attr = inverseRecord ? inverseRecord[inverse] : null;
|
285
337
|
if (attr && attr.inverseDidRemoveRecord) {
|
286
|
-
attr.inverseDidRemoveRecord(inverseRecord, inverse,
|
338
|
+
attr.inverseDidRemoveRecord(inverseRecord, inverse, parent, pname);
|
287
339
|
}
|
288
340
|
}
|
289
341
|
|
@@ -293,22 +345,29 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
293
345
|
}
|
294
346
|
|
295
347
|
// notify additions
|
296
|
-
for(i=0;i<
|
348
|
+
for (i = 0; i < recsLen; i++) {
|
297
349
|
inverseRecord = recs.objectAt(i);
|
298
350
|
attr = inverseRecord ? inverseRecord[inverse] : null;
|
299
351
|
if (attr && attr.inverseDidAddRecord) {
|
300
|
-
attr.inverseDidAddRecord(inverseRecord, inverse,
|
352
|
+
attr.inverseDidAddRecord(inverseRecord, inverse, parent, pname);
|
301
353
|
}
|
302
354
|
}
|
303
355
|
|
304
356
|
}
|
305
357
|
|
306
|
-
//
|
307
|
-
|
308
|
-
|
309
|
-
|
358
|
+
// Notify that the content did change.
|
359
|
+
this.arrayContentDidChange(idx, amt, recsLen);
|
360
|
+
|
361
|
+
// Update our cache! So when the record property change comes back down we can ignore it.
|
362
|
+
this._sc_prevStoreIds = storeIds;
|
310
363
|
|
311
|
-
|
364
|
+
// Only mark record dirty if there is no inverse or we are master.
|
365
|
+
if (parent && (!inverse || this.get('isMaster'))) {
|
366
|
+
|
367
|
+
// We must indicate to the parent that we have been modified, so they can
|
368
|
+
// update their status.
|
369
|
+
parent.recordDidChange(pname);
|
370
|
+
}
|
312
371
|
|
313
372
|
return this;
|
314
373
|
},
|
@@ -324,16 +383,31 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
324
383
|
@param {SC.Record} inverseRecord the record that was removed
|
325
384
|
@returns {SC.ManyArray} receiver
|
326
385
|
*/
|
327
|
-
removeInverseRecord: function(inverseRecord) {
|
328
|
-
|
386
|
+
removeInverseRecord: function (inverseRecord) {
|
387
|
+
// Fast path!
|
329
388
|
if (!inverseRecord) return this; // nothing to do
|
389
|
+
|
330
390
|
var id = inverseRecord.get('id'),
|
331
|
-
|
332
|
-
|
333
|
-
|
391
|
+
storeIds = this.get('editableStoreIds'),
|
392
|
+
idx = (storeIds && id) ? storeIds.indexOf(id) : -1,
|
393
|
+
record;
|
334
394
|
|
335
395
|
if (idx >= 0) {
|
336
|
-
|
396
|
+
|
397
|
+
// Notify that the content will change.
|
398
|
+
this.arrayContentWillChange(idx, 1, 0);
|
399
|
+
|
400
|
+
// Perform a raw array replace without any KVO checks.
|
401
|
+
// NOTE: the cache must be updated to mirror changes to the storeIds
|
402
|
+
storeIds.splice(idx, 1);
|
403
|
+
if (this._records) { this._records.splice(idx, 1); }
|
404
|
+
|
405
|
+
// Notify that the content did change.
|
406
|
+
this.arrayContentDidChange(idx, 1, 0);
|
407
|
+
|
408
|
+
// Update our cache! So when the record property change comes back down we can ignore it.
|
409
|
+
this._sc_prevStoreIds = storeIds;
|
410
|
+
|
337
411
|
if (this.get('isMaster') && (record = this.get('record'))) {
|
338
412
|
record.recordDidChange(this.get('propertyName'));
|
339
413
|
}
|
@@ -354,16 +428,39 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
354
428
|
if (!inverseRecord) return this;
|
355
429
|
|
356
430
|
var storeIds = this.get('editableStoreIds'),
|
357
|
-
|
358
|
-
|
359
|
-
|
431
|
+
orderBy = this.get('orderBy'),
|
432
|
+
len = storeIds.get('length'),
|
433
|
+
idx, record,
|
434
|
+
removeCount, addCount;
|
360
435
|
|
361
436
|
// find idx to insert at.
|
362
437
|
if (orderBy) {
|
363
438
|
idx = this._findInsertionLocation(inverseRecord, 0, len, orderBy);
|
364
|
-
} else idx = len;
|
365
439
|
|
366
|
-
|
440
|
+
// All objects from idx to the end must be removed to do an ordered insert.
|
441
|
+
removeCount = storeIds.length - idx;
|
442
|
+
addCount = storeIds.length - idx + 1;
|
443
|
+
} else {
|
444
|
+
idx = len;
|
445
|
+
|
446
|
+
removeCount = 0;
|
447
|
+
addCount = 1;
|
448
|
+
}
|
449
|
+
|
450
|
+
// Notify that the content will change.
|
451
|
+
this.arrayContentWillChange(idx, removeCount, addCount);
|
452
|
+
|
453
|
+
// Perform a raw array replace without any KVO checks.
|
454
|
+
// NOTE: the cache must be updated to mirror changes to the storeIds
|
455
|
+
storeIds.splice(idx, 0, inverseRecord.get('id'));
|
456
|
+
if (this._records) { this._records.splice(idx, 0, null); }
|
457
|
+
|
458
|
+
// Notify that the content did change.
|
459
|
+
this.arrayContentDidChange(idx, removeCount, addCount);
|
460
|
+
|
461
|
+
// Update our cache! So when the record property change comes back down we can ignore it.
|
462
|
+
this._sc_prevStoreIds = storeIds;
|
463
|
+
|
367
464
|
if (this.get('isMaster') && (record = this.get('record'))) {
|
368
465
|
record.recordDidChange(this.get('propertyName'));
|
369
466
|
}
|
@@ -401,82 +498,81 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
|
|
401
498
|
ret, idx, len;
|
402
499
|
|
403
500
|
if (t === SC.T_FUNCTION) ret = orderBy(a, b);
|
404
|
-
else if (t === SC.T_STRING) ret = SC.compare(a,b);
|
501
|
+
else if (t === SC.T_STRING) ret = SC.compare(a, b);
|
405
502
|
else {
|
406
503
|
len = orderBy.get('length');
|
407
504
|
ret = 0;
|
408
|
-
for(idx=0;
|
505
|
+
for (idx = 0; ret === 0 && idx < len; idx++) ret = SC.compare(a, b);
|
409
506
|
}
|
410
507
|
|
411
|
-
return ret
|
508
|
+
return ret;
|
412
509
|
},
|
413
510
|
|
414
|
-
|
415
|
-
|
416
|
-
|
511
|
+
/**
|
512
|
+
Call this when a new record that was added to the many array previously
|
513
|
+
has been committed and now has a proper `id`. This will fix up the temporary
|
514
|
+
id that was used to allow the new record to be a part of this many array.
|
417
515
|
|
418
|
-
|
419
|
-
Invoked whenever the `storeIds` array changes. Observes changes.
|
516
|
+
@return {void}
|
420
517
|
*/
|
421
|
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
var storeIds = this.get('readOnlyStoreIds'), oldLen, newLen;
|
426
|
-
var prev = this._prevStoreIds, f = this._storeIdsContentDidChange;
|
427
|
-
|
428
|
-
if (storeIds === prev) return this; // nothing to do
|
429
|
-
|
430
|
-
if (prev) {
|
431
|
-
prev.removeArrayObservers({
|
432
|
-
target: this,
|
433
|
-
willChange: this.arrayContentWillChange,
|
434
|
-
didChange: f
|
435
|
-
});
|
436
|
-
|
437
|
-
oldLen = prev.get('length');
|
438
|
-
} else {
|
439
|
-
oldLen = 0;
|
440
|
-
}
|
518
|
+
updateNewRecordId: function (rec) {
|
519
|
+
var storeIds = this.get('editableStoreIds'),
|
520
|
+
idx;
|
441
521
|
|
442
|
-
|
443
|
-
|
444
|
-
target: this,
|
445
|
-
willChange: this.arrayContentWillChange,
|
446
|
-
didChange: f
|
447
|
-
});
|
522
|
+
// Update the storeIds array with the new record id.
|
523
|
+
idx = storeIds.indexOf('_sc_id_placeholder_' + rec.get('storeKey'));
|
448
524
|
|
449
|
-
|
450
|
-
|
451
|
-
|
525
|
+
// Beware of records that are no longer a part of storeIds.
|
526
|
+
if (idx >= 0) {
|
527
|
+
storeIds.replace(idx, 1, [rec.get('id')]);
|
452
528
|
}
|
453
|
-
|
454
|
-
this.arrayContentWillChange(0, oldLen, newLen);
|
455
|
-
this._prevStoreIds = storeIds;
|
456
|
-
this._storeIdsContentDidChange(0, oldLen, newLen);
|
457
529
|
},
|
458
530
|
|
459
|
-
|
460
|
-
|
461
|
-
|
462
|
-
has changed.
|
463
|
-
*/
|
464
|
-
_storeIdsContentDidChange: function(start, removedCount, addedCount) {
|
465
|
-
this._records = null ; // clear cache
|
466
|
-
this.arrayContentDidChange(start, removedCount, addedCount);
|
467
|
-
},
|
531
|
+
// ..........................................................
|
532
|
+
// INTERNAL SUPPORT
|
533
|
+
//
|
468
534
|
|
469
535
|
/** @private */
|
470
|
-
unknownProperty: function(key, value) {
|
536
|
+
unknownProperty: function (key, value) {
|
471
537
|
var ret;
|
472
538
|
if (SC.typeOf(key) === SC.T_STRING) ret = this.reducedProperty(key, value);
|
473
539
|
return ret === undefined ? sc_super() : ret;
|
474
540
|
},
|
475
541
|
|
476
542
|
/** @private */
|
477
|
-
init: function() {
|
543
|
+
init: function () {
|
478
544
|
sc_super();
|
545
|
+
|
546
|
+
// Initialize.
|
479
547
|
this.recordPropertyDidChange();
|
548
|
+
},
|
549
|
+
|
550
|
+
/** @private
|
551
|
+
This is called by the parent record whenever its properties change. It is
|
552
|
+
also called by the ChildrenAttribute transform when the attribute is set
|
553
|
+
to a new array.
|
554
|
+
*/
|
555
|
+
recordPropertyDidChange: function (keys) {
|
556
|
+
if (keys && !keys.contains(this.get('propertyName'))) return this;
|
557
|
+
|
558
|
+
var oldLength = this.get('length'),
|
559
|
+
storeIds = this.get('readOnlyStoreIds'),
|
560
|
+
newLength = storeIds ? storeIds.length : 0,
|
561
|
+
prev = this._sc_prevStoreIds;
|
562
|
+
|
563
|
+
// Fast Path! No actual change to our backing array attribute so we should
|
564
|
+
// not notify any changes.
|
565
|
+
if (storeIds === prev) { return; }
|
566
|
+
|
567
|
+
// Throw away our cache.
|
568
|
+
this._records = null;
|
569
|
+
|
570
|
+
// Notify that the content did change.
|
571
|
+
this.arrayContentDidChange(0, oldLength, newLength);
|
572
|
+
|
573
|
+
// Cache our backing array so we can avoid updates when we haven't actually
|
574
|
+
// changed. See fast path above.
|
575
|
+
this._sc_prevStoreIds = storeIds;
|
480
576
|
}
|
481
577
|
|
482
578
|
});
|