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
@@ -10,8 +10,10 @@
|
|
10
10
|
/*globals module, test, ok, isObj, equals, expects */
|
11
11
|
|
12
12
|
var url, request, contents, test_timeout=2500;
|
13
|
-
|
14
|
-
|
13
|
+
|
14
|
+
// When running Travis-CI tests through PhantomJS, wait extra long.
|
15
|
+
if (window._phantom) {
|
16
|
+
test_timeout=5000;
|
15
17
|
}
|
16
18
|
|
17
19
|
module("SC.Request", {
|
@@ -28,6 +30,28 @@ module("SC.Request", {
|
|
28
30
|
|
29
31
|
});
|
30
32
|
|
33
|
+
test("PRELIM: Verify basic functionality in testing environment.", function() {
|
34
|
+
if (SC.platform.get('supportsXHR2ProgressEvent')) {
|
35
|
+
var xhr = new XMLHttpRequest;
|
36
|
+
xhr.addEventListener('load', function() {
|
37
|
+
ok(true, 'Success: xhr.addEventListener for load event.');
|
38
|
+
nextTest();
|
39
|
+
});
|
40
|
+
xhr.open("get", url);
|
41
|
+
xhr.send();
|
42
|
+
|
43
|
+
window.stop(test_timeout);
|
44
|
+
|
45
|
+
function nextTest() {
|
46
|
+
request.notify('load', this, function() {
|
47
|
+
ok(true, 'Success: SC.Request#notify for load event.');
|
48
|
+
window.start();
|
49
|
+
});
|
50
|
+
request.send();
|
51
|
+
}
|
52
|
+
}
|
53
|
+
});
|
54
|
+
|
31
55
|
test("Basic Requirements", function() {
|
32
56
|
ok(SC.Request, "SC.Request is defined");
|
33
57
|
ok("" !== url, "url variable is not empty");
|
@@ -100,25 +124,32 @@ test("Default properties are correct for different types of requests.", function
|
|
100
124
|
jsonBody = { a: 1, b: 2 };
|
101
125
|
formBody = "fname=Henry&lname=Ford";
|
102
126
|
req1 = SC.Request.getUrl(url).json()._prep();
|
103
|
-
req2 = SC.Request.postUrl(
|
104
|
-
req3 = SC.Request.putUrl(url, xmlBody).xml()._prep();
|
105
|
-
req4 = SC.Request.patchUrl(url, jsonBody).json()._prep();
|
106
|
-
req5 = SC.Request.deleteUrl(
|
127
|
+
req2 = SC.Request.postUrl(window.location.href, formBody).header('Content-Type', 'application/x-www-form-urlencoded')._prep().credentials(false);
|
128
|
+
req3 = SC.Request.putUrl('https://localhost:4020' + url, xmlBody).xml()._prep();
|
129
|
+
req4 = SC.Request.patchUrl('http://localhost' + url, jsonBody).json()._prep();
|
130
|
+
req5 = SC.Request.deleteUrl(window.location.href + '?params=true')._prep();
|
107
131
|
|
108
132
|
ok(req1.get('isJSON'), 'req1 should have isJSON true');
|
109
133
|
ok(!req1.get('isXML'), 'req1 should have isXML false');
|
134
|
+
ok(req1.get('allowCredentials'), 'req1 should have allowCredentials true');
|
135
|
+
ok(req1.get('isSameDomain'), 'req1: %@ should have isSameDomain true'.fmt(url));
|
110
136
|
equals(req1.header('Content-Type'), undefined, 'req1 should have Content-Type header as');
|
111
137
|
ok(!req2.get('isJSON'), 'req2 should have isJSON false');
|
112
138
|
ok(!req2.get('isXML'), 'req2 should have isXML false');
|
139
|
+
ok(!req2.get('allowCredentials'), 'req2 should have allowCredentials false');
|
140
|
+
ok(req2.get('isSameDomain'), 'req2: %@ should have isSameDomain true'.fmt(window.location.href));
|
113
141
|
equals(req2.header('Content-Type'), 'application/x-www-form-urlencoded', 'req2 should have Content-Type header as');
|
114
142
|
ok(!req3.get('isJSON'), 'req3 should have isJSON false');
|
115
143
|
ok(req3.get('isXML'), 'req3 should have isXML true');
|
144
|
+
ok(!req3.get('isSameDomain'), 'req3: %@ should have isSameDomain false'.fmt('https://localhost:4020' + url));
|
116
145
|
equals(req3.header('Content-Type'), 'text/xml', 'req3 should have Content-Type header as');
|
117
146
|
ok(req4.get('isJSON'), 'req4 should have isJSON true');
|
118
147
|
ok(!req4.get('isXML'), 'req4 should have isXML false');
|
148
|
+
ok(!req4.get('isSameDomain'), 'req4: %@ should have isSameDomain false'.fmt('http://localhost' + url));
|
119
149
|
equals(req4.header('Content-Type'), 'application/json', 'req4 should have Content-Type header as');
|
120
150
|
ok(!req5.get('isJSON'), 'req5 should have isJSON false');
|
121
151
|
ok(!req5.get('isXML'), 'req5 should have isXML false');
|
152
|
+
ok(req5.get('isSameDomain'), 'req5: %@ should have isSameDomain true'.fmt(window.location.href + '?params=true'));
|
122
153
|
equals(req5.header('Content-Type'), undefined, 'req5 should have Content-Type header as');
|
123
154
|
});
|
124
155
|
|
@@ -157,7 +188,6 @@ test("Test Synchronous GET Request", function() {
|
|
157
188
|
test("Test Asynchronous GET Request, auto-deserializing JSON", function() {
|
158
189
|
request.set("isJSON", YES);
|
159
190
|
|
160
|
-
|
161
191
|
var timer;
|
162
192
|
|
163
193
|
timer = setTimeout( function(){
|
@@ -368,7 +398,7 @@ test("Test Multiple listeners per single status response", function() {
|
|
368
398
|
var response;
|
369
399
|
|
370
400
|
expect(8);
|
371
|
-
|
401
|
+
|
372
402
|
// sanity check
|
373
403
|
equals(SC.Request.manager.inflight.length,0,"there should be no inflight requests");
|
374
404
|
|
@@ -381,7 +411,7 @@ test("Test Multiple listeners per single status response", function() {
|
|
381
411
|
numResponses++;
|
382
412
|
ok(true, "Received a response on second listener");
|
383
413
|
});
|
384
|
-
|
414
|
+
|
385
415
|
setTimeout(function() {
|
386
416
|
equals(SC.Request.manager.inflight.length,0,"there should be no inflight requests after the timeout");
|
387
417
|
equals(numResponses, 2, "got two notifications");
|
@@ -405,7 +435,7 @@ test("Test Multiple listeners per single status response", function() {
|
|
405
435
|
*/
|
406
436
|
test("Multiple arguments passed to notify()", function() {
|
407
437
|
var response;
|
408
|
-
|
438
|
+
|
409
439
|
// sanity check
|
410
440
|
equals(SC.Request.manager.inflight.length,0,"there should be no inflight requests");
|
411
441
|
|
@@ -459,12 +489,13 @@ test("Test event listeners on successful request.", function() {
|
|
459
489
|
request.notify(200, this, function(response) {
|
460
490
|
status = response.status;
|
461
491
|
|
462
|
-
if (
|
492
|
+
if (SC.platform.get('supportsXHR2ProgressEvent')) {
|
463
493
|
ok(loadstart, "Received a loadstart event.");
|
464
494
|
ok(progress, "Received a progress event.");
|
465
495
|
ok(load, "Received a load event.");
|
466
|
-
ok(loadend, "Received a loadend event.");
|
496
|
+
if (SC.platform.get('supportsXHR2LoadEndEvent')) ok(loadend, "Received a loadend event.");
|
467
497
|
}
|
498
|
+
|
468
499
|
ok(!abort, "Did not receive an abort event.");
|
469
500
|
ok(!error, "Did not receive an error event.");
|
470
501
|
ok(!timeout, "Did not receive a timeout event.");
|
@@ -478,14 +509,13 @@ test("Test event listeners on successful request.", function() {
|
|
478
509
|
response = request.send();
|
479
510
|
});
|
480
511
|
|
481
|
-
if (
|
512
|
+
if (SC.platform.get('supportsXHR2ProgressEvent')) {
|
482
513
|
test("Test event listeners on aborted request.", function() {
|
483
514
|
var abort = false,
|
484
515
|
error = false,
|
485
516
|
load = false,
|
486
|
-
loadend = false,
|
487
517
|
loadstart = false,
|
488
|
-
|
518
|
+
loadend = false,
|
489
519
|
response,
|
490
520
|
status,
|
491
521
|
timeout = false;
|
@@ -505,14 +535,18 @@ if (window.XMLHttpRequestProgressEvent) {
|
|
505
535
|
response.cancel();
|
506
536
|
});
|
507
537
|
|
508
|
-
request.notify(
|
538
|
+
request.notify(SC.platform.get('supportsXHR2LoadEndEvent') ? 'loadend' : 'abort', this, function(evt) {
|
509
539
|
loadend = true;
|
510
540
|
|
511
541
|
ok(loadstart, "Received a loadstart event.");
|
512
542
|
ok(progress, "Received a progress event.");
|
513
543
|
ok(abort, "Received an abort event.");
|
514
544
|
ok(!load, "Did not receive a load event.");
|
515
|
-
|
545
|
+
if (SC.platform.get('supportsXHR2LoadEndEvent')) {
|
546
|
+
ok(loadend, "Received a loadend event.");
|
547
|
+
} else {
|
548
|
+
ok(loadend, "loadend event not supported. Received terminal abort event.");
|
549
|
+
}
|
516
550
|
ok(!error, "Did not receive an error event.");
|
517
551
|
ok(!timeout, "Did not receive a timeout event.");
|
518
552
|
equals(status, undefined, "Did not receive a status notification.");
|
@@ -560,11 +594,11 @@ test("Test upload event listeners on successful request.", function() {
|
|
560
594
|
request.notify(200, this, function(response) {
|
561
595
|
status = response.status;
|
562
596
|
|
563
|
-
if (
|
597
|
+
if (SC.platform.get('supportsXHR2ProgressEvent')) {
|
564
598
|
ok(loadstart, "Received a loadstart event.");
|
565
599
|
ok(progress, "Received a progress event.");
|
566
600
|
ok(load, "Received a load event.");
|
567
|
-
ok(loadend, "Received a loadend event.");
|
601
|
+
if (SC.platform.get('supportsXHR2LoadEndEvent')) ok(loadend, "Received a loadend event.");
|
568
602
|
}
|
569
603
|
ok(!abort, "Did not receive an abort event.");
|
570
604
|
ok(!error, "Did not receive an error event.");
|
@@ -575,8 +609,9 @@ test("Test upload event listeners on successful request.", function() {
|
|
575
609
|
});
|
576
610
|
|
577
611
|
// Make a significant body object.
|
612
|
+
// It looks that Firefox is not sending the progress event if the request is too small
|
578
613
|
var i;
|
579
|
-
for (i =
|
614
|
+
for (i = 200000; i >= 0; i--) {
|
580
615
|
body['k' + i] = 'v' + i;
|
581
616
|
}
|
582
617
|
|
@@ -590,30 +625,118 @@ test("Test manager.cancelAll.", function() {
|
|
590
625
|
var manager = SC.Request.manager, max = manager.get('maxRequests');
|
591
626
|
// Make sure we're clear.
|
592
627
|
SC.Request.manager.cancelAll();
|
593
|
-
|
628
|
+
|
594
629
|
// Get a copy of the previous arrays, since they're overwritten on clear.
|
595
630
|
var inflight = manager.get('inflight');
|
596
631
|
var pending = manager.get('pending');
|
597
|
-
|
632
|
+
|
598
633
|
// Generate > 6 requests
|
599
634
|
for( var i = 0; i < max * 2; i++) {
|
600
635
|
SC.Request.getUrl('/').send();
|
601
636
|
}
|
602
|
-
|
637
|
+
|
603
638
|
equals(inflight.get('length'), max, "There must be %@ inflight requests".fmt(max));
|
604
639
|
equals(pending.get('length'), max, "There must be %@ pending requests".fmt(max));
|
605
|
-
|
640
|
+
|
606
641
|
SC.Request.manager.cancelAll();
|
607
642
|
|
608
643
|
// Demonstrates memory pointer matches
|
609
644
|
equals(inflight, manager.getPath('inflight'), "Arrays must be identical");
|
610
645
|
equals(pending, manager.getPath('pending'), "Arrays must be identical");
|
611
|
-
|
646
|
+
|
612
647
|
// Demonstrates that all previous requests have been cleared.
|
613
648
|
equals(inflight.get('length'), 0, "There must be 0 inflight requests in the old array".fmt(max));
|
614
649
|
equals(pending.get('length'), 0, "There must be 0 pending requests in the old array".fmt(max));
|
615
|
-
|
650
|
+
|
616
651
|
// Demonstrates that the manager doesn't know about any requests.
|
617
652
|
equals(manager.getPath('inflight.length'), 0, "There must be 0 inflight requests".fmt(max));
|
618
653
|
equals(manager.getPath('pending.length'), 0, "There must be 0 pending requests".fmt(max));
|
619
654
|
});
|
655
|
+
|
656
|
+
test("Test responses moving between pending and inflight states", function() {
|
657
|
+
var prevMaxRequests = SC.Request.manager.get('maxRequests'),
|
658
|
+
request2 = SC.Request.getUrl(url),
|
659
|
+
response,
|
660
|
+
response2;
|
661
|
+
|
662
|
+
// This gives us precise control over when our requests fire.
|
663
|
+
SC.Request.manager.set('maxRequests', 0);
|
664
|
+
|
665
|
+
request.notify('loadstart', function (evt) {
|
666
|
+
ok(!SC.Request.manager.isPending(response), 'First request is no longer pending.');
|
667
|
+
ok(SC.Request.manager.isInFlight(response), 'First request is now inflight.');
|
668
|
+
ok(SC.Request.manager.isPending(response2), 'Second request is still pending.');
|
669
|
+
ok(!SC.Request.manager.isInFlight(response2), 'Second request is not inflight.');
|
670
|
+
});
|
671
|
+
|
672
|
+
request.notify('progress', this, function(evt) {
|
673
|
+
ok(!SC.Request.manager.isPending(response), 'First request is not pending.');
|
674
|
+
ok(SC.Request.manager.isInFlight(response), 'First request is still inflight.');
|
675
|
+
ok(SC.Request.manager.isPending(response2), 'Second request is still pending.');
|
676
|
+
ok(!SC.Request.manager.isInFlight(response2), 'Second request is not inflight.');
|
677
|
+
});
|
678
|
+
|
679
|
+
request.notify('loadend', this, function (evt) {
|
680
|
+
ok(!SC.Request.manager.isPending(response), 'First request is not pending.');
|
681
|
+
ok(SC.Request.manager.isInFlight(response), 'First request is still inflight.');
|
682
|
+
ok(SC.Request.manager.isPending(response2), 'Second request is still pending.');
|
683
|
+
ok(!SC.Request.manager.isInFlight(response2), 'Second request is not inflight.');
|
684
|
+
});
|
685
|
+
|
686
|
+
request.notify(this, function (evt) {
|
687
|
+
ok(!SC.Request.manager.isPending(response), 'First request is not pending.');
|
688
|
+
ok(SC.Request.manager.isInFlight(response), 'First request is still inflight.');
|
689
|
+
ok(SC.Request.manager.isPending(response2), 'Second request is still pending.');
|
690
|
+
ok(!SC.Request.manager.isInFlight(response2), 'Second request is not inflight.');
|
691
|
+
});
|
692
|
+
|
693
|
+
request2.notify('loadstart', this, function(evt) {
|
694
|
+
ok(!SC.Request.manager.isPending(response), 'First request is not pending.');
|
695
|
+
ok(!SC.Request.manager.isInFlight(response), 'First request is no longer inflight.');
|
696
|
+
ok(!SC.Request.manager.isPending(response2), 'Second request is no longer pending.');
|
697
|
+
ok(SC.Request.manager.isInFlight(response2), 'Second request is now inflight.');
|
698
|
+
});
|
699
|
+
|
700
|
+
request2.notify('progress', this, function(evt) {
|
701
|
+
ok(!SC.Request.manager.isPending(response), 'First request is not pending.');
|
702
|
+
ok(!SC.Request.manager.isInFlight(response), 'First request is not inflight.');
|
703
|
+
ok(!SC.Request.manager.isPending(response2), 'Second request is not pending.');
|
704
|
+
ok(SC.Request.manager.isInFlight(response2), 'Second request is still inflight.');
|
705
|
+
});
|
706
|
+
|
707
|
+
request2.notify('loadend', this, function(evt) {
|
708
|
+
ok(!SC.Request.manager.isPending(response), 'First request is not pending.');
|
709
|
+
ok(!SC.Request.manager.isInFlight(response), 'First request is not inflight.');
|
710
|
+
ok(!SC.Request.manager.isPending(response2), 'Second request is not pending.');
|
711
|
+
ok(SC.Request.manager.isInFlight(response2), 'Second request is still inflight.');
|
712
|
+
});
|
713
|
+
|
714
|
+
request2.notify(this, function (evt) {
|
715
|
+
ok(!SC.Request.manager.isPending(response), 'First request is not pending.');
|
716
|
+
ok(!SC.Request.manager.isInFlight(response), 'First request is not inflight.');
|
717
|
+
ok(!SC.Request.manager.isPending(response2), 'Second request is not pending.');
|
718
|
+
ok(SC.Request.manager.isInFlight(response2), 'Second request is still inflight.');
|
719
|
+
|
720
|
+
SC.Request.manager.set('maxRequests', prevMaxRequests);
|
721
|
+
window.start();
|
722
|
+
});
|
723
|
+
|
724
|
+
response = request.send();
|
725
|
+
response2 = request2.send();
|
726
|
+
|
727
|
+
ok(SC.Request.manager.isPending(response), 'First request is pending.');
|
728
|
+
ok(!SC.Request.manager.isInFlight(response), 'First request is not inflight.');
|
729
|
+
ok(SC.Request.manager.isPending(response2), 'Second request is pending.');
|
730
|
+
ok(!SC.Request.manager.isInFlight(response2), 'Second request is not inflight.');
|
731
|
+
|
732
|
+
SC.Request.manager.set('maxRequests', 1);
|
733
|
+
SC.Request.manager.fireRequestIfNeeded();
|
734
|
+
|
735
|
+
ok(!SC.Request.manager.isPending(response), 'First request is no longer pending.');
|
736
|
+
ok(SC.Request.manager.isInFlight(response), 'First request is inflight.');
|
737
|
+
ok(SC.Request.manager.isPending(response2), 'Second request is still pending.');
|
738
|
+
ok(!SC.Request.manager.isInFlight(response2), 'Second request is not inflight.');
|
739
|
+
|
740
|
+
|
741
|
+
stop();
|
742
|
+
});
|
@@ -0,0 +1,197 @@
|
|
1
|
+
// ==========================================================================
|
2
|
+
// Project: SC.WebSocket
|
3
|
+
// Copyright: ©2013 Nicolas BADIA and contributors
|
4
|
+
// License: Licensed under MIT license (see license.js)
|
5
|
+
// ==========================================================================
|
6
|
+
// SC.WebSocket Base Tests
|
7
|
+
|
8
|
+
var url = 'ws://url';
|
9
|
+
|
10
|
+
SC.WebSocket.reopen({
|
11
|
+
server: url,
|
12
|
+
autoReconnect: false
|
13
|
+
});
|
14
|
+
|
15
|
+
module("SC.WebSocket", {
|
16
|
+
setup: function () {},
|
17
|
+
teardown: function () {}
|
18
|
+
});
|
19
|
+
|
20
|
+
test("Basic Requirements", function () {
|
21
|
+
ok(SC.WebSocket, "SC.WebSocket is defined");
|
22
|
+
|
23
|
+
var webSocket = SC.WebSocket.create().connect();
|
24
|
+
|
25
|
+
ok(webSocket.isSupported === true, "webSocket should be supported");
|
26
|
+
ok(webSocket.socket !== null, "webSocket.socket object is not null");
|
27
|
+
});
|
28
|
+
|
29
|
+
test("Test nofitications", function () {
|
30
|
+
var webSocket = SC.WebSocket.create({
|
31
|
+
isJSON: false
|
32
|
+
}).connect(),
|
33
|
+
socket = webSocket.socket,
|
34
|
+
didNotifyOnOpen = didNotifySecondOnOpenListener = false,
|
35
|
+
didNotifyOnMessage = false,
|
36
|
+
didNotifyOnClose = didNotifySecondOnCloseListener = false,
|
37
|
+
didNotifyOnError = false;
|
38
|
+
|
39
|
+
webSocket.notify('onopen', this, function(websocket, response, arg) {
|
40
|
+
equals(response.type, 'open', "response type should be 'open'");
|
41
|
+
equals(arg, 'arg', "arg should be 'arg'");
|
42
|
+
didNotifyOnOpen = true;
|
43
|
+
}, 'arg');
|
44
|
+
|
45
|
+
webSocket.notify('onopen', this, function(websocket, response, arg) {
|
46
|
+
didNotifySecondOnOpenListener = true;
|
47
|
+
});
|
48
|
+
|
49
|
+
webSocket.notify('onmessage', this, function(websocket, response) {
|
50
|
+
equals(response.type, 'message', "response type should be 'message'");
|
51
|
+
didNotifyOnMessage = true;
|
52
|
+
});
|
53
|
+
|
54
|
+
webSocket.notify('onclose', this, function(websocket, response) {
|
55
|
+
equals(response.type, 'close', "response type should be 'close'");
|
56
|
+
didNotifyOnClose = true;
|
57
|
+
return true;
|
58
|
+
});
|
59
|
+
|
60
|
+
webSocket.notify('onclose', this, function(websocket, response) {
|
61
|
+
didNotifySecondOnCloseListener = true;
|
62
|
+
});
|
63
|
+
|
64
|
+
webSocket.notify('onerror', this, function(websocket, response) {
|
65
|
+
equals(response.type, 'error', "response type should be 'error'");
|
66
|
+
didNotifyOnError = true;
|
67
|
+
});
|
68
|
+
|
69
|
+
|
70
|
+
stop(100);
|
71
|
+
setTimeout(function () {
|
72
|
+
socket.onopen({ type: 'open' });
|
73
|
+
socket.onmessage({ data: { type: 'message' } });
|
74
|
+
socket.onclose({ type: 'close' });
|
75
|
+
socket.onerror({ type: 'error' });
|
76
|
+
|
77
|
+
ok(didNotifyOnOpen, "onopen listener should have been notified");
|
78
|
+
ok(didNotifySecondOnOpenListener, "second onopen listener should have been notified");
|
79
|
+
ok(didNotifyOnMessage, "onmessage listener should have been notified");
|
80
|
+
ok(didNotifyOnClose, "onclose listener should have been notified");
|
81
|
+
ok(!didNotifySecondOnCloseListener, "second onclose listener should not have been notified");
|
82
|
+
ok(didNotifyOnError, "onerror listener should have been notified");
|
83
|
+
|
84
|
+
window.start();
|
85
|
+
}, 50);
|
86
|
+
});
|
87
|
+
|
88
|
+
test("Test delegate handling", function () {
|
89
|
+
var webSocket = SC.WebSocket.create({
|
90
|
+
delegate: SC.Object.create(SC.WebSocketDelegate, {
|
91
|
+
webSocketDidOpen: function (webSocket, event) { return true; },
|
92
|
+
webSocketDidReceiveMessage: function (webSocket, data) { return true; },
|
93
|
+
webSocketDidClose: function (webSocket, closeEvent) { return true; },
|
94
|
+
webSocketDidError: function (webSocket, event) { return true; },
|
95
|
+
})
|
96
|
+
}).connect(),
|
97
|
+
socket = webSocket.socket,
|
98
|
+
count = 0;
|
99
|
+
|
100
|
+
webSocket.notify('onopen', this, function () { count++; });
|
101
|
+
webSocket.notify('onmessage', this, function () { count++; });
|
102
|
+
webSocket.notify('onclose', this, function () { count++; });
|
103
|
+
webSocket.notify('onerror', this, function () { count++; });
|
104
|
+
|
105
|
+
stop(100);
|
106
|
+
setTimeout(function () {
|
107
|
+
socket.onopen({ type: 'open' });
|
108
|
+
socket.onmessage({ data: { type: 'message' } });
|
109
|
+
socket.onclose({ type: 'close' });
|
110
|
+
socket.onerror({ type: 'error' });
|
111
|
+
|
112
|
+
equals(count, 0, "listeners should not have been notified");
|
113
|
+
window.start();
|
114
|
+
}, 50);
|
115
|
+
});
|
116
|
+
|
117
|
+
// Disabling this test. It fails every second time when pushed to Travis-CI.
|
118
|
+
// test("Test auto reconnection", function () {
|
119
|
+
// var count = 0,
|
120
|
+
// webSocket = SC.WebSocket.create({
|
121
|
+
// autoReconnect: true,
|
122
|
+
// reconnectInterval: 10,
|
123
|
+
|
124
|
+
// webSocketDidClose: function (webSocket, closeEvent) {
|
125
|
+
// count++;
|
126
|
+
// if (count > 1) {
|
127
|
+
// return true;
|
128
|
+
// }
|
129
|
+
// },
|
130
|
+
// }).connect();
|
131
|
+
|
132
|
+
// stop(100);
|
133
|
+
// setTimeout(function () {
|
134
|
+
// ok(count > 1, "should have tried a reconnection");
|
135
|
+
// window.start();
|
136
|
+
// }, 50);
|
137
|
+
// });
|
138
|
+
|
139
|
+
test("Test queue", function () {
|
140
|
+
var count = 0,
|
141
|
+
webSocket = SC.WebSocket.create({
|
142
|
+
onClose: function(closeEvent) {},
|
143
|
+
}).connect(),
|
144
|
+
socket = webSocket.socket;
|
145
|
+
|
146
|
+
|
147
|
+
webSocket.socket.send = function() {
|
148
|
+
count++;
|
149
|
+
}
|
150
|
+
|
151
|
+
webSocket.send('message1');
|
152
|
+
webSocket.send('message2');
|
153
|
+
|
154
|
+
equals(webSocket.queue.length, 2, "2 messages should be in the queue");
|
155
|
+
|
156
|
+
socket.onopen();
|
157
|
+
|
158
|
+
equals(webSocket.queue, null, "the queue should be empty");
|
159
|
+
});
|
160
|
+
|
161
|
+
test("Test authentification", function () {
|
162
|
+
var count = 0,
|
163
|
+
webSocket = SC.WebSocket.create({
|
164
|
+
onClose: function(closeEvent) {},
|
165
|
+
|
166
|
+
delegate: SC.Object.create(SC.WebSocketDelegate, {
|
167
|
+
webSocketDidOpen: function (webSocket, event) {
|
168
|
+
webSocket.send({ op: "auth", clientId: 'xxx' });
|
169
|
+
webSocket.set('isAuth', false);
|
170
|
+
},
|
171
|
+
webSocketDidReceiveMessage: function (webSocket, data) {
|
172
|
+
if (data === 'isAuth') {
|
173
|
+
webSocket.set('isAuth', true);
|
174
|
+
return true;
|
175
|
+
}
|
176
|
+
},
|
177
|
+
})
|
178
|
+
}).connect(),
|
179
|
+
socket = webSocket.socket;
|
180
|
+
|
181
|
+
webSocket.socket.send = function() {}
|
182
|
+
|
183
|
+
ok(!webSocket.isAuth, "the connection should not be authentified");
|
184
|
+
|
185
|
+
socket.onopen();
|
186
|
+
|
187
|
+
webSocket.send('message1');
|
188
|
+
|
189
|
+
equals(webSocket.queue.length, 1, "1 message should be in the queue");
|
190
|
+
|
191
|
+
socket.onmessage({ data: 'isAuth' });
|
192
|
+
|
193
|
+
webSocket.send('message2');
|
194
|
+
|
195
|
+
ok(webSocket.isAuth, "the connection should be authentified");
|
196
|
+
equals(webSocket.queue, null, "the queue should be empty");
|
197
|
+
});
|