sproutcore 1.7.1.beta → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG +44 -0
- data/README.rdoc +20 -20
- data/VERSION.yml +3 -3
- data/lib/Buildfile +1 -1
- data/lib/buildtasks/build.rake +5 -0
- data/lib/buildtasks/manifest.rake +19 -1
- data/lib/frameworks/sproutcore/Buildfile +19 -17
- data/lib/frameworks/sproutcore/CHANGELOG.md +163 -29
- data/lib/frameworks/sproutcore/README.md +29 -8
- data/lib/frameworks/sproutcore/apps/statechart_routing/Buildfile +12 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/controllers/login_controller.js +11 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/controllers/main_controller.js +7 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/controllers/statechart_controller.js +17 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/core.js +25 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/main.js +15 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/resources/_theme.css +18 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/resources/bar_page.js +14 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/resources/foo_page.js +14 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/resources/loading.rhtml +9 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/resources/login_page.js +61 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/resources/main_page.js +46 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/statechart.js +76 -0
- data/lib/frameworks/sproutcore/apps/statechart_routing/theme.js +27 -0
- data/lib/frameworks/sproutcore/apps/tests/controllers/targets.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/states/no_targets.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/states/ready_detail.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/states/ready_empty.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/states/ready_list.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/states/ready_no_tests.js +1 -1
- data/lib/frameworks/sproutcore/apps/welcome/controllers/targets.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/ajax/system/request.js +14 -1
- data/lib/frameworks/sproutcore/frameworks/ajax/system/response.js +15 -15
- data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/request.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/animation/core.js +8 -5
- data/lib/frameworks/sproutcore/frameworks/bootstrap/system/browser.js +302 -70
- data/lib/frameworks/sproutcore/frameworks/bootstrap/system/loader.js +19 -14
- data/lib/frameworks/sproutcore/frameworks/bootstrap/tests/system/browser.js +471 -149
- data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/array.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/object.js +42 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/run_loop.js +3 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/string.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/action_support.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/delegate_support.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/responder_context.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/selection_support.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/body_overflow.js +63 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/keyboard.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/layout.js +37 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/main.js +28 -6
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane.js +10 -3
- data/lib/frameworks/sproutcore/frameworks/core_foundation/protocols/sparse_array_delegate.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/browser.js +66 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/builder.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/cursor.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/event.js +58 -57
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/locale.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/locale.js.orig +445 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/platform.js +51 -31
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/ready.js +5 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/render_context.js +53 -69
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/responder.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/root_responder.js +98 -72
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/string.js +37 -3
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/timer.js +7 -4
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/array_case.js +21 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/content_destroyed.js +7 -7
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/string.js +23 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/browser.js +66 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/event.js +22 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/locale.js +11 -11
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/end.js +4 -4
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/escape_html.js +41 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/helpers_className.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/helpers_style.js +8 -8
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/update.js +17 -16
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/selection_set/remove.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/build_children.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/class_name_bindings_test.js +15 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/createChildViews.js +5 -5
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js +50 -30
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/acceleration.js +46 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/animation.js +1 -43
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/keyboard.js +8 -34
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout.js +3 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout_style.js +10 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/manipulation.js +6 -5
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/theming.js +22 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/data_sources/data_source.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/mixins/relationship_support.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/models/child_attribute.js +0 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/models/children_attribute.js +35 -0
- data/lib/frameworks/sproutcore/frameworks/datastore/models/record.js +46 -19
- data/lib/frameworks/sproutcore/frameworks/datastore/models/record_attribute.js +23 -9
- data/lib/frameworks/sproutcore/frameworks/datastore/models/single_attribute.js +2 -3
- data/lib/frameworks/sproutcore/frameworks/datastore/system/many_array.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/system/nested_store.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/system/query.js +294 -302
- data/lib/frameworks/sproutcore/frameworks/datastore/system/query.js.orig +1531 -0
- data/lib/frameworks/sproutcore/frameworks/datastore/system/record_array.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/system/store.js +14 -11
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/many_array.js +63 -0
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/many_attribute.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record.js +4 -4
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array.js +50 -10
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array_complex.js +4 -4
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_complex.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/destroy.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/refresh.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record_attribute.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/single_attribute.js +114 -67
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/commitChangesFromNestedStore.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/readDataHash.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/compare.js +54 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/evaluation.js +29 -9
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/parse.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/record_array/core_methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/record_array/flush.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/cancelRecord.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/commitChangesFromNestedStore.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/commitRecord.js +37 -45
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/find.js +127 -127
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/pushChanges.js +16 -0
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/pushRelationships.js +42 -4
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/readDataHash.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/system/datetime.js +13 -7
- data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/tests/system/datetime.js +8 -0
- data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/resources/strings.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/system/datetime.js +1 -0
- data/lib/frameworks/sproutcore/frameworks/debug/core.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/core.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_row_delegate.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_view_delegate.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/alert.js +1 -4
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js +19 -6
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/modal.js +30 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/palette.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/panel.js +24 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/picker.js +121 -28
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/sheet.js +15 -15
- data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drag_data_source.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drop_target.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/protocols/responder.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/button.js +39 -15
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/collection.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/disclosure.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/image_button.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/panel.js +14 -6
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/popup_button.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/progress.js +11 -11
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/segment.js +4 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/segmented.js +1 -51
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/slider.js +11 -16
- data/lib/frameworks/sproutcore/frameworks/desktop/resources/images/icons/sc-icon-error-48.png +0 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/resources/slider.css +0 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/system/drag.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/system/undo_manager.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/ui.js +9 -9
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/content.js +11 -11
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/ui.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/reload.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/date_field/ui.js +107 -81
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowDelegate.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/progress/ui.js +68 -60
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/radio/methods.js +57 -12
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/integration.js +21 -19
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroller.js +5 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/ui.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select/ui.js +32 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/split/methods.js +12 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/stacked/ui_comments.js +12 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/methods.js +0 -8
- data/lib/frameworks/sproutcore/frameworks/desktop/views/button.js +77 -132
- data/lib/frameworks/sproutcore/frameworks/desktop/views/checkbox.js +5 -6
- data/lib/frameworks/sproutcore/frameworks/desktop/views/collection.js +16 -15
- data/lib/frameworks/sproutcore/frameworks/desktop/views/date_field.js +52 -52
- data/lib/frameworks/sproutcore/frameworks/desktop/views/disclosure.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/grid.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/list.js +147 -147
- data/lib/frameworks/sproutcore/frameworks/desktop/views/list_item.js +11 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_item.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_scroll.js +5 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/views/popup_button.js +22 -12
- data/lib/frameworks/sproutcore/frameworks/desktop/views/radio.js +13 -7
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scene.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll.js +462 -441
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scroller.js +48 -62
- data/lib/frameworks/sproutcore/frameworks/desktop/views/segment.js +22 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/segmented.js +150 -32
- data/lib/frameworks/sproutcore/frameworks/desktop/views/select.js +104 -45
- data/lib/frameworks/sproutcore/frameworks/desktop/views/select_button.js +42 -20
- data/lib/frameworks/sproutcore/frameworks/desktop/views/slider.js +24 -24
- data/lib/frameworks/sproutcore/frameworks/desktop/views/split.js +148 -154
- data/lib/frameworks/sproutcore/frameworks/desktop/views/stacked.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/static_content.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/tab.js +8 -7
- data/lib/frameworks/sproutcore/frameworks/desktop/views/web.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/experimental/Buildfile +2 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/controllers/files.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/controllers/library.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/controllers/targets.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/controllers/view_configs.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/mixins/drop_down.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/states/ready.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/views/plist_item.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/views/web.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/controllers/page_design.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/css/css_style_sheet.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/designers/object_designer.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/designers/view_designer.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/mixins/snap_lines.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/views/designer_drop_target.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/views/drawing.js +21 -21
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/views/page_item_view.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/forms/views/form.js +59 -53
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/menu/views/menu/scroll.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/simple.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/core_scroll.js +6 -6
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/desktop/scroll.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/scroll_view/views/touch/scroll.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/ext/menu.js +14 -10
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/ext/menu_item.js +17 -6
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/views/popup_button.js +38 -14
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/select_view/views/select.js +5 -13
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/mixins/split_child.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/mixins/split_thumb.js +5 -3
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/children.js +19 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/methods.js +20 -2
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/split_thumb.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/views/split.js +35 -12
- data/lib/frameworks/sproutcore/frameworks/formatters/README +6 -0
- data/lib/frameworks/sproutcore/frameworks/formatters/english.lproj/strings.js +174 -0
- data/lib/frameworks/sproutcore/frameworks/formatters/formatters/date_formatter.js +351 -0
- data/lib/frameworks/sproutcore/frameworks/formatters/tests/date_formatter.js +517 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/core.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_resize.js +345 -138
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/button.js +5 -3
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_value_support.js +176 -42
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/editable.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/flowed_layout.js +137 -105
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/gestureable.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_editable.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_editor.js +16 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/static_layout.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/validatable.js +47 -47
- data/lib/frameworks/sproutcore/frameworks/foundation/private/tree_item_observer.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/helpers/sizing.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/label.js +28 -6
- data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/render_delegate.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/resources/benchmark.css +0 -5
- data/lib/frameworks/sproutcore/frameworks/foundation/resources/bootstrap.rhtml +34 -19
- data/lib/frameworks/sproutcore/frameworks/foundation/resources/button_view.css +0 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/resources/label.css +1 -5
- data/lib/frameworks/sproutcore/frameworks/foundation/resources/text_field.css +8 -9
- data/lib/frameworks/sproutcore/frameworks/foundation/system/benchmark.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/system/module.js +179 -47
- data/lib/frameworks/sproutcore/frameworks/foundation/system/task_queue.js +34 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/text_selection.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/user_defaults.js +26 -12
- data/lib/frameworks/sproutcore/frameworks/foundation/system/utils/misc.js +7 -7
- data/lib/frameworks/sproutcore/frameworks/foundation/system/utils/string_measurement.js +12 -4
- data/lib/frameworks/sproutcore/frameworks/foundation/system/utils/string_metric_optimization.js +202 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/content_value_support/content.js +77 -8
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/flowed_layout/tests.js +1 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editable/beginEditing.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editable/commitEditing.js +4 -3
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editable/discardEditing.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editor/beginEditing.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editor/commitEditing.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editor/discardEditing.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/pointInElement.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/label/ui.js +0 -8
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/ui.js +163 -149
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/credit_card.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/date.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/date_time.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/password.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/validator.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/foundation/views/field.js +16 -43
- data/lib/frameworks/sproutcore/frameworks/foundation/views/image.js +4 -3
- data/lib/frameworks/sproutcore/frameworks/foundation/views/inline_text_field.js +67 -54
- data/lib/frameworks/sproutcore/frameworks/foundation/views/label.js +49 -38
- data/lib/frameworks/sproutcore/frameworks/foundation/views/text_field.js +285 -242
- data/lib/frameworks/sproutcore/frameworks/jquery/jquery-buffer.js +13 -13
- data/lib/frameworks/sproutcore/frameworks/jquery/jquery-buffered.js +19 -22
- data/lib/frameworks/sproutcore/frameworks/jquery/jquery-sc.js +9 -3
- data/lib/frameworks/sproutcore/frameworks/jquery/jquery.js +231 -186
- data/lib/frameworks/sproutcore/frameworks/media/views/audio.js +145 -143
- data/lib/frameworks/sproutcore/frameworks/media/views/video.js +156 -154
- data/lib/frameworks/sproutcore/frameworks/qunit/qunit/qunit.js +5 -5
- data/lib/frameworks/sproutcore/frameworks/routing/system/routes.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/routing/system/routes.js.orig +540 -0
- data/lib/frameworks/sproutcore/frameworks/routing/tests/system/routes.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/runtime/core.js +15 -8
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/base.js +5 -5
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/replace.js +12 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/ext/function.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/array.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/copyable.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/enumerable.js +7 -7
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/observable.js +98 -32
- data/lib/frameworks/sproutcore/frameworks/runtime/private/chain_observer.js +7 -2
- data/lib/frameworks/sproutcore/frameworks/runtime/private/observer_queue.js +14 -3
- data/lib/frameworks/sproutcore/frameworks/runtime/private/observer_set.js +98 -13
- data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js +8 -14
- data/lib/frameworks/sproutcore/frameworks/runtime/system/enumerator.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/system/error.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/runtime/system/index_set.js +23 -6
- data/lib/frameworks/sproutcore/frameworks/runtime/system/logger.js +69 -18
- data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js +57 -31
- data/lib/frameworks/sproutcore/frameworks/runtime/system/run_loop.js +189 -14
- data/lib/frameworks/sproutcore/frameworks/runtime/system/string.js +82 -22
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/chained.js +20 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/observable.js +125 -4
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/private/observer_queue.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/binding.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/rangeStartForIndex.js +37 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/remove.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/logger.js +16 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/run_loop.js +75 -4
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/string.js +41 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/mixins/statechart_delegate.js +113 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/private/state_path_matcher.js +312 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/system/async.js +18 -22
- data/lib/frameworks/sproutcore/frameworks/statechart/system/state.js +508 -131
- data/lib/frameworks/sproutcore/frameworks/statechart/system/state_route_handler_context.js +78 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/system/statechart.js +265 -44
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/basic/with_concurrent_states.js +16 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/responder/responder_chain.js +11 -3
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/private/state_path_matcher.js +116 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/methods/add_substate.js +108 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/methods/find_first_relative_current_state/with_concurrent.js +179 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/methods/find_first_relative_current_state/without_concurrent.js +74 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/methods/get_state.js +141 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/methods/get_substate.js +340 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/methods/route_triggered.js +161 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/methods/try_to_handle_event.js +288 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/history_state/standard/without_concurrent_states/context.js +5 -33
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/routing/with_concurrent_states/basic.js +213 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/routing/without_concurrent_states/basic.js +212 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/standard/without_concurrent_states/core.js +8 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{state/namespacing.js → statechart/methods/get_state.js} +3 -41
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/statechart/{invoke_state_method.js → methods/invoke_state_method.js} +1 -1
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{event_handling/advanced → statechart}/respond_to_event.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/system/state_route_handler_context/methods/retry.js +64 -0
- data/lib/frameworks/sproutcore/frameworks/table/core.js +2 -0
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/controls/button.js +0 -1
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/ext/handlebars.js +29 -5
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/ext/handlebars/bind.js +4 -3
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/ext/handlebars/collection.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/ext/handlebars/localization.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/ext/handlebars/view.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{handlebars → template_view}/handlebars.js +493 -357
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/mixins/template_helpers/checkbox_support.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/mixins/template_helpers/text_field_support.js +13 -2
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/panes/template.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/tests/controls/button.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/tests/mixins/template_helpers/checkbox_support.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/tests/mixins/template_helpers/text_field_support.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/tests/panes/template.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/tests/views/template/collection.js +39 -14
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/tests/views/template/core.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/tests/views/template/handlebars.js +57 -6
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/views/bindable_span.js +21 -6
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/views/template.js +9 -3
- data/lib/frameworks/sproutcore/frameworks/{core_foundation → template_view}/views/template_collection.js +55 -26
- data/lib/frameworks/sproutcore/frameworks/testing/system/equiv.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/testing/system/plan.js +122 -122
- data/lib/frameworks/sproutcore/frameworks/testing/system/runner.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/testing/system/suite.js +4 -4
- data/lib/frameworks/sproutcore/frameworks/yuireset/resources/base.css +1 -1
- data/lib/frameworks/sproutcore/frameworks/yuireset/resources/reset.css +0 -1
- data/lib/frameworks/sproutcore/frameworks/yuireset/resources/view.css +4 -4
- data/lib/frameworks/sproutcore/lib/index.rhtml +55 -32
- data/lib/frameworks/sproutcore/license.js +2 -4
- data/lib/frameworks/sproutcore/themes/ace/resources/body.css +5 -1
- data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/18px/button.css +2 -2
- data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/24px/button.css +21 -13
- data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/30px/button.css +17 -10
- data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/44px/button.css +4 -3
- data/lib/frameworks/sproutcore/themes/ace/resources/button/dark/24px/button.css +20 -12
- data/lib/frameworks/sproutcore/themes/ace/resources/button/dark/30px/button.css +16 -8
- data/lib/frameworks/sproutcore/themes/ace/resources/button/dark/jumbo/button.css +17 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/button/dark/small/button.css +17 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/disclosure/ace/disclosure.css +2 -2
- data/lib/frameworks/sproutcore/themes/ace/resources/master-detail/master-detail.css +2 -2
- data/lib/frameworks/sproutcore/themes/ace/resources/picker/popover/popover.css +5 -3
- data/lib/frameworks/sproutcore/themes/iphone_theme/english.lproj/core.css +1 -1
- data/lib/frameworks/sproutcore/themes/legacy_theme/english.lproj/toolbar.css +1 -1
- data/lib/gen/app/USAGE +17 -4
- data/lib/gen/language/Buildfile +4 -4
- data/lib/gen/language/USAGE +4 -4
- data/lib/gen/page/templates/pages/@target_name@/Buildfile +7 -7
- data/lib/gen/{html_app → statechart_app}/Buildfile +0 -0
- data/lib/gen/{html_app → statechart_app}/README +0 -0
- data/lib/gen/statechart_app/USAGE +21 -0
- data/lib/gen/statechart_app/templates/apps/@target_name@/Buildfile +9 -0
- data/lib/gen/statechart_app/templates/apps/@target_name@/core.js +24 -0
- data/lib/gen/statechart_app/templates/apps/@target_name@/main.js +26 -0
- data/lib/gen/statechart_app/templates/apps/@target_name@/resources/_theme.css +18 -0
- data/lib/gen/statechart_app/templates/apps/@target_name@/resources/loading.rhtml +9 -0
- data/lib/gen/statechart_app/templates/apps/@target_name@/resources/main_page.js +21 -0
- data/lib/gen/statechart_app/templates/apps/@target_name@/statechart.js +8 -0
- data/lib/gen/statechart_app/templates/apps/@target_name@/states/ready_state.js +12 -0
- data/lib/gen/statechart_app/templates/apps/@target_name@/theme.js +24 -0
- data/lib/sproutcore/builders.rb +1 -0
- data/lib/sproutcore/builders/base.rb +19 -1
- data/lib/sproutcore/builders/chance_file.rb +6 -1
- data/lib/sproutcore/builders/handlebars.rb +1 -9
- data/lib/sproutcore/builders/javascript.rb +1 -10
- data/lib/sproutcore/builders/json.rb +25 -0
- data/lib/sproutcore/builders/less.rb +1 -1
- data/lib/sproutcore/builders/sass.rb +1 -1
- data/lib/sproutcore/builders/stylesheet.rb +1 -9
- data/lib/sproutcore/helpers/html5_manifest.rb +1 -1
- data/lib/sproutcore/helpers/static_helper.rb +42 -0
- data/lib/sproutcore/rack/proxy.rb +21 -3
- data/lib/sproutcore/rack/service.rb +3 -2
- data/lib/sproutcore/tools.rb +18 -25
- data/lib/sproutcore/tools/gen.rb +10 -3
- data/lib/sproutcore/tools/init.rb +11 -10
- data/spec/buildtasks/manifest/prepare_build_tasks/json_spec.rb +62 -0
- data/spec/fixtures/builder_tests/apps/handlebars_test/Buildfile +1 -1
- data/spec/fixtures/builder_tests/apps/json_test/sc_static.json +2 -0
- data/spec/lib/builders/json_spec.rb +53 -0
- data/sproutcore.gemspec +2 -2
- data/vendor/chance/lib/chance/parser.rb +1 -1
- metadata +222 -177
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/datetime.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/debug/invoke_once_last_debugging.js +0 -259
- data/lib/frameworks/sproutcore/frameworks/documentation/core.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/system/chance.js +0 -69
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/editable/ui.js +0 -44
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/ui.js +0 -64
- data/lib/frameworks/sproutcore/frameworks/mini/license.js +0 -30
- data/lib/gen/html_app/USAGE +0 -15
- data/lib/gen/html_app/templates/apps/@target_name@/@target_name@.js +0 -11
- data/lib/gen/html_app/templates/apps/@target_name@/resources/images/.gitkeep +0 -0
- data/lib/gen/html_app/templates/apps/@target_name@/resources/stylesheets/@target_name@.css +0 -6
- data/lib/gen/html_app/templates/apps/@target_name@/resources/templates/@target_name@.handlebars +0 -1
- data/lib/gen/html_project/Buildfile +0 -45
- data/lib/gen/html_project/INIT +0 -3
- data/lib/gen/html_project/README +0 -1
- data/lib/gen/html_project/USAGE +0 -2
- data/lib/gen/html_project/templates/@filename@/Buildfile +0 -5
- data/lib/gen/html_project/templates/@filename@/README +0 -4
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
// ==========================================================================
|
|
2
|
+
// SC Unit Test
|
|
3
|
+
// ==========================================================================
|
|
4
|
+
/*globals SC */
|
|
5
|
+
|
|
6
|
+
var sc, root, stateA, stateB, stateC, stateD, stateE, stateF;
|
|
7
|
+
|
|
8
|
+
module("SC.State: findFirstRelativeCurrentState method Tests (without concurrent states)", {
|
|
9
|
+
|
|
10
|
+
setup: function() {
|
|
11
|
+
|
|
12
|
+
sc = SC.Statechart.create({
|
|
13
|
+
initialState: 'a',
|
|
14
|
+
|
|
15
|
+
a: SC.State.design({
|
|
16
|
+
|
|
17
|
+
initialSubstate: 'c',
|
|
18
|
+
|
|
19
|
+
c: SC.State.design(),
|
|
20
|
+
|
|
21
|
+
d: SC.State.design()
|
|
22
|
+
|
|
23
|
+
}),
|
|
24
|
+
|
|
25
|
+
b: SC.State.design({
|
|
26
|
+
|
|
27
|
+
initialSubstate: 'e',
|
|
28
|
+
|
|
29
|
+
e: SC.State.design(),
|
|
30
|
+
|
|
31
|
+
f: SC.State.design()
|
|
32
|
+
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
sc.initStatechart();
|
|
38
|
+
|
|
39
|
+
root = sc.get('rootState');
|
|
40
|
+
stateA = sc.getState('a');
|
|
41
|
+
stateB = sc.getState('b');
|
|
42
|
+
stateC = sc.getState('c');
|
|
43
|
+
stateD = sc.getState('d');
|
|
44
|
+
stateE = sc.getState('e');
|
|
45
|
+
stateF = sc.getState('f');
|
|
46
|
+
},
|
|
47
|
+
|
|
48
|
+
teardown: function() {
|
|
49
|
+
sc = root = stateA = stateB = stateC = stateD = stateE = stateF = null;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
test("check when current state is state C", function() {
|
|
55
|
+
equals(root.findFirstRelativeCurrentState(), stateC, "root state should return state C");
|
|
56
|
+
equals(stateA.findFirstRelativeCurrentState(), stateC, "state A should return state C");
|
|
57
|
+
equals(stateB.findFirstRelativeCurrentState(), stateC, "state B should return state C");
|
|
58
|
+
equals(stateC.findFirstRelativeCurrentState(), stateC, "state C should return state C");
|
|
59
|
+
equals(stateD.findFirstRelativeCurrentState(), stateC, "state D should return state C");
|
|
60
|
+
equals(stateE.findFirstRelativeCurrentState(), stateC, "state E should return state C");
|
|
61
|
+
equals(stateF.findFirstRelativeCurrentState(), stateC, "state F should return state C");
|
|
62
|
+
});
|
|
63
|
+
|
|
64
|
+
test("check when current state is state F", function() {
|
|
65
|
+
sc.gotoState(stateF);
|
|
66
|
+
|
|
67
|
+
equals(root.findFirstRelativeCurrentState(), stateF, "root state should return state F");
|
|
68
|
+
equals(stateA.findFirstRelativeCurrentState(), stateF, "state A should return state F");
|
|
69
|
+
equals(stateB.findFirstRelativeCurrentState(), stateF, "state B should return state F");
|
|
70
|
+
equals(stateC.findFirstRelativeCurrentState(), stateF, "state C should return state F");
|
|
71
|
+
equals(stateD.findFirstRelativeCurrentState(), stateF, "state D should return state F");
|
|
72
|
+
equals(stateE.findFirstRelativeCurrentState(), stateF, "state E should return state F");
|
|
73
|
+
equals(stateF.findFirstRelativeCurrentState(), stateF, "state F should return state F");
|
|
74
|
+
});
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
// ==========================================================================
|
|
2
|
+
// SC Unit Test
|
|
3
|
+
// ==========================================================================
|
|
4
|
+
/*globals SC */
|
|
5
|
+
|
|
6
|
+
var sc, root;
|
|
7
|
+
|
|
8
|
+
module("SC.State: getState method Tests", {
|
|
9
|
+
|
|
10
|
+
setup: function() {
|
|
11
|
+
|
|
12
|
+
sc = SC.Statechart.create({
|
|
13
|
+
|
|
14
|
+
initialState: 'a',
|
|
15
|
+
|
|
16
|
+
a: SC.State.design({
|
|
17
|
+
|
|
18
|
+
initialSubstate: 'x',
|
|
19
|
+
|
|
20
|
+
x: SC.State.design(),
|
|
21
|
+
|
|
22
|
+
y: SC.State.design(),
|
|
23
|
+
|
|
24
|
+
foo: SC.State.design()
|
|
25
|
+
|
|
26
|
+
}),
|
|
27
|
+
|
|
28
|
+
b: SC.State.design({
|
|
29
|
+
|
|
30
|
+
initialSubstate: 'x',
|
|
31
|
+
|
|
32
|
+
x: SC.State.design(),
|
|
33
|
+
|
|
34
|
+
y: SC.State.design(),
|
|
35
|
+
|
|
36
|
+
bar: SC.State.design()
|
|
37
|
+
|
|
38
|
+
}),
|
|
39
|
+
|
|
40
|
+
c: SC.State.design({
|
|
41
|
+
|
|
42
|
+
initialSubstate: 'x',
|
|
43
|
+
|
|
44
|
+
x: SC.State.design(),
|
|
45
|
+
|
|
46
|
+
z: SC.State.design()
|
|
47
|
+
|
|
48
|
+
})
|
|
49
|
+
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
sc.initStatechart();
|
|
53
|
+
root = sc.get('rootState');
|
|
54
|
+
},
|
|
55
|
+
|
|
56
|
+
teardown: function() {
|
|
57
|
+
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
test("get existing, umambiguous states from state Z", function() {
|
|
63
|
+
var state,
|
|
64
|
+
z = root.getSubstate('z');
|
|
65
|
+
|
|
66
|
+
state = z.getState('z');
|
|
67
|
+
equals(state, z, "should return self for value 'z'");
|
|
68
|
+
|
|
69
|
+
state = z.getState(z);
|
|
70
|
+
equals(state, z, "should return self for value state Z");
|
|
71
|
+
|
|
72
|
+
state = z.getState('a');
|
|
73
|
+
equals(state.get('fullPath'), 'a', "should return state for value 'a'");
|
|
74
|
+
equals(z.getState(state).get('fullPath'), 'a', "should return state for state A");
|
|
75
|
+
|
|
76
|
+
state = z.getState('b');
|
|
77
|
+
equals(state.get('fullPath'), 'b', "should return state for value 'b'");
|
|
78
|
+
|
|
79
|
+
state = z.getState('c');
|
|
80
|
+
equals(state.get('fullPath'), 'c', "should return state for value 'c'");
|
|
81
|
+
|
|
82
|
+
state = z.getState('foo');
|
|
83
|
+
equals(state.get('fullPath'), 'a.foo', "should return state for value 'foo'");
|
|
84
|
+
|
|
85
|
+
state = z.getState('a.foo');
|
|
86
|
+
equals(state.get('fullPath'), 'a.foo', "should return state for value 'a.foo'");
|
|
87
|
+
|
|
88
|
+
state = z.getState('bar');
|
|
89
|
+
equals(state.get('fullPath'), 'b.bar', "should return state for value 'bar'");
|
|
90
|
+
|
|
91
|
+
state = z.getState('b.bar');
|
|
92
|
+
equals(state.get('fullPath'), 'b.bar', "should return state for value 'a.bar'");
|
|
93
|
+
|
|
94
|
+
state = z.getState('a.x');
|
|
95
|
+
equals(state.get('fullPath'), 'a.x', "should return state for value 'a.x'");
|
|
96
|
+
|
|
97
|
+
state = z.getState('a.y');
|
|
98
|
+
equals(state.get('fullPath'), 'a.y', "should return state for value 'a.y'");
|
|
99
|
+
|
|
100
|
+
state = z.getState('b.x');
|
|
101
|
+
equals(state.get('fullPath'), 'b.x', "should return state for value 'b.x'");
|
|
102
|
+
|
|
103
|
+
state = z.getState('b.y');
|
|
104
|
+
equals(state.get('fullPath'), 'b.y', "should return state for value 'b.y'");
|
|
105
|
+
|
|
106
|
+
state = z.getState('c.x');
|
|
107
|
+
equals(state.get('fullPath'), 'c.x', "should return state for value 'c.x'");
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
test("get state x from sibling states", function() {
|
|
111
|
+
var state,
|
|
112
|
+
foo = root.getSubstate('a.foo'),
|
|
113
|
+
bar = root.getSubstate('b.bar'),
|
|
114
|
+
z = root.getSubstate('c.z');
|
|
115
|
+
|
|
116
|
+
state = foo.getState('x');
|
|
117
|
+
equals(state.get('fullPath'), 'a.x', "for state foo, should return state a.x for value 'x'");
|
|
118
|
+
|
|
119
|
+
state = bar.getState('x');
|
|
120
|
+
equals(state.get('fullPath'), 'b.x', "for state bar, should return state b.x for value 'x'");
|
|
121
|
+
|
|
122
|
+
state = z.getState('x');
|
|
123
|
+
equals(state.get('fullPath'), 'c.x', "for state z, should return state c.x for value 'x'");
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
test("get state x from state a", function() {
|
|
127
|
+
var state,
|
|
128
|
+
a = root.getSubstate('a');
|
|
129
|
+
|
|
130
|
+
state = a.getState('x');
|
|
131
|
+
equals(state.get('fullPath'), 'a.x', "should return state A.X");
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
test("attempty to get state y from state z", function() {
|
|
135
|
+
var state,
|
|
136
|
+
z = root.getSubstate('c.z');
|
|
137
|
+
|
|
138
|
+
console.log('expecting to get an error...');
|
|
139
|
+
state = z.getState('y');
|
|
140
|
+
ok(!state, "should not get a state for 'y'");
|
|
141
|
+
});
|
|
@@ -0,0 +1,340 @@
|
|
|
1
|
+
// ==========================================================================
|
|
2
|
+
// SC Unit Test
|
|
3
|
+
// ==========================================================================
|
|
4
|
+
/*globals SC */
|
|
5
|
+
|
|
6
|
+
var sc, root;
|
|
7
|
+
|
|
8
|
+
module("SC.State: getSubstate method Tests", {
|
|
9
|
+
|
|
10
|
+
setup: function() {
|
|
11
|
+
|
|
12
|
+
sc = SC.Statechart.create({
|
|
13
|
+
|
|
14
|
+
initialState: 'foo',
|
|
15
|
+
|
|
16
|
+
foo: SC.State.design({
|
|
17
|
+
|
|
18
|
+
initialSubstate: 'a',
|
|
19
|
+
|
|
20
|
+
a: SC.State.design({
|
|
21
|
+
initialSubstate: 'a1',
|
|
22
|
+
a1: SC.State.design(),
|
|
23
|
+
z: SC.State.design()
|
|
24
|
+
}),
|
|
25
|
+
|
|
26
|
+
b: SC.State.design({
|
|
27
|
+
initialSubstate: 'b1',
|
|
28
|
+
b1: SC.State.design(),
|
|
29
|
+
z: SC.State.design()
|
|
30
|
+
})
|
|
31
|
+
|
|
32
|
+
}),
|
|
33
|
+
|
|
34
|
+
bar: SC.State.design({
|
|
35
|
+
|
|
36
|
+
initialSubstate: 'x',
|
|
37
|
+
|
|
38
|
+
x: SC.State.design({
|
|
39
|
+
initialSubstate: 'x1',
|
|
40
|
+
x1: SC.State.design(),
|
|
41
|
+
z: SC.State.design()
|
|
42
|
+
}),
|
|
43
|
+
|
|
44
|
+
y: SC.State.design({
|
|
45
|
+
initialSubstate: 'y1',
|
|
46
|
+
y1: SC.State.design(),
|
|
47
|
+
z: SC.State.design()
|
|
48
|
+
})
|
|
49
|
+
|
|
50
|
+
}),
|
|
51
|
+
|
|
52
|
+
x: SC.State.design({
|
|
53
|
+
|
|
54
|
+
initialSubstate: 'a',
|
|
55
|
+
|
|
56
|
+
a: SC.State.design({
|
|
57
|
+
initialSubstate: 'a1',
|
|
58
|
+
a1: SC.State.design(),
|
|
59
|
+
z: SC.State.design()
|
|
60
|
+
}),
|
|
61
|
+
|
|
62
|
+
b: SC.State.design({
|
|
63
|
+
initialSubstate: 'b1',
|
|
64
|
+
b1: SC.State.design(),
|
|
65
|
+
z: SC.State.design()
|
|
66
|
+
})
|
|
67
|
+
|
|
68
|
+
})
|
|
69
|
+
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
sc.initStatechart();
|
|
73
|
+
root = sc.get('rootState');
|
|
74
|
+
},
|
|
75
|
+
|
|
76
|
+
teardown: function() {
|
|
77
|
+
sc = root = null;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
test("get immediate substates from root state", function() {
|
|
83
|
+
var state;
|
|
84
|
+
|
|
85
|
+
state = root.getSubstate('foo');
|
|
86
|
+
equals(state.get('fullPath'), 'foo', "should return state foo for 'foo'");
|
|
87
|
+
|
|
88
|
+
state = root.getSubstate('this.foo');
|
|
89
|
+
equals(state.get('fullPath'), 'foo', "should return state foo for 'this.foo'");
|
|
90
|
+
|
|
91
|
+
state = root.getSubstate('bar');
|
|
92
|
+
equals(state.get('fullPath'), 'bar', "should return state bar for 'bar'");
|
|
93
|
+
|
|
94
|
+
state = root.getSubstate('this.bar');
|
|
95
|
+
equals(state.get('fullPath'), 'bar', "should return state bar for 'this.bar'");
|
|
96
|
+
|
|
97
|
+
console.log('expecting error message...');
|
|
98
|
+
state = root.getSubstate('x');
|
|
99
|
+
ok(!state, "should not return state for 'x'");
|
|
100
|
+
|
|
101
|
+
state = root.getSubstate('this.x');
|
|
102
|
+
equals(state.get('fullPath'), 'x', "should return state x for 'this.x'");
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
test("get immediate substates from foo state", function() {
|
|
106
|
+
var foo = root.getSubstate('foo'),
|
|
107
|
+
state;
|
|
108
|
+
|
|
109
|
+
state = foo.getSubstate('a');
|
|
110
|
+
equals(state.get('fullPath'), 'foo.a', "should return state A for 'a'");
|
|
111
|
+
|
|
112
|
+
state = foo.getSubstate('this.a');
|
|
113
|
+
equals(state.get('fullPath'), 'foo.a', "should return state A for 'this.a'");
|
|
114
|
+
|
|
115
|
+
state = foo.getSubstate('b');
|
|
116
|
+
equals(state.get('fullPath'), 'foo.b', "should return state bar for 'b'");
|
|
117
|
+
|
|
118
|
+
state = foo.getSubstate('this.b');
|
|
119
|
+
equals(state.get('fullPath'), 'foo.b', "should return state bar for 'this.b'");
|
|
120
|
+
|
|
121
|
+
state = foo.getSubstate('mah');
|
|
122
|
+
ok(!state, "should not return state for 'mah'");
|
|
123
|
+
|
|
124
|
+
state = foo.getSubstate('foo');
|
|
125
|
+
ok(!state, "should not return state for 'foo'");
|
|
126
|
+
});
|
|
127
|
+
|
|
128
|
+
test("get immediate substates from bar state", function() {
|
|
129
|
+
var bar = root.getSubstate('bar'),
|
|
130
|
+
state;
|
|
131
|
+
|
|
132
|
+
state = bar.getSubstate('x');
|
|
133
|
+
equals(state.get('name'), 'x', "should return state X for 'x'");
|
|
134
|
+
|
|
135
|
+
state = bar.getSubstate('this.x');
|
|
136
|
+
equals(state.get('name'), 'x', "should return state X for 'this.x'");
|
|
137
|
+
|
|
138
|
+
state = bar.getSubstate('y');
|
|
139
|
+
equals(state.get('name'), 'y', "should return state Y for 'y'");
|
|
140
|
+
|
|
141
|
+
state = bar.getSubstate('this.y');
|
|
142
|
+
equals(state.get('name'), 'y', "should return state Y for 'this.y'");
|
|
143
|
+
|
|
144
|
+
state = bar.getSubstate('mah');
|
|
145
|
+
ok(!state, "should not return state for 'mah'");
|
|
146
|
+
|
|
147
|
+
state = bar.getSubstate('bar');
|
|
148
|
+
ok(!state, "should not return state for 'bar'");
|
|
149
|
+
});
|
|
150
|
+
|
|
151
|
+
test("get substates from root using full paths", function() {
|
|
152
|
+
var state;
|
|
153
|
+
|
|
154
|
+
state = root.getSubstate('foo.a');
|
|
155
|
+
equals(state.get('name'), 'a', "should return state A for 'foo.a'");
|
|
156
|
+
|
|
157
|
+
state = root.getSubstate('foo.b');
|
|
158
|
+
equals(state.get('name'), 'b', "should return state B for 'foo.b'");
|
|
159
|
+
|
|
160
|
+
state = root.getSubstate('foo.mah');
|
|
161
|
+
ok(!state, "should not return state for 'foo.mah'");
|
|
162
|
+
|
|
163
|
+
state = root.getSubstate('foo.a.a1');
|
|
164
|
+
equals(state.get('name'), 'a1', "should return state A1 for 'foo.a.a1'");
|
|
165
|
+
|
|
166
|
+
state = root.getSubstate('foo.a.z');
|
|
167
|
+
equals(state.get('fullPath'), 'foo.a.z', "should return first Z state for 'foo.a.z'");
|
|
168
|
+
|
|
169
|
+
state = root.getSubstate('foo.b.b1');
|
|
170
|
+
equals(state.get('name'), 'b1', "should return state B1 for 'foo.b.b1'");
|
|
171
|
+
|
|
172
|
+
state = root.getSubstate('foo.b.z');
|
|
173
|
+
equals(state.get('fullPath'), 'foo.b.z', "should return second Z state for 'foo.b.z'");
|
|
174
|
+
|
|
175
|
+
state = root.getSubstate('bar.x');
|
|
176
|
+
equals(state.get('name'), 'x', "should return state X for 'bar.x'");
|
|
177
|
+
|
|
178
|
+
state = root.getSubstate('bar.y');
|
|
179
|
+
equals(state.get('name'), 'y', "should return state Y for 'bar.y'");
|
|
180
|
+
|
|
181
|
+
state = root.getSubstate('bar.mah');
|
|
182
|
+
ok(!state, "should not return state for 'bar.mah'");
|
|
183
|
+
|
|
184
|
+
state = root.getSubstate('bar.x.x1');
|
|
185
|
+
equals(state.get('name'), 'x1', "should return state X1 for 'foo.x.x1'");
|
|
186
|
+
|
|
187
|
+
state = root.getSubstate('bar.x.z');
|
|
188
|
+
equals(state.get('fullPath'), 'bar.x.z', "should return third Z state for 'bar.x.z'");
|
|
189
|
+
|
|
190
|
+
state = root.getSubstate('bar.y.y1');
|
|
191
|
+
equals(state.get('name'), 'y1', "should return state Y1 for 'foo.y.y1'");
|
|
192
|
+
|
|
193
|
+
state = root.getSubstate('bar.y.z');
|
|
194
|
+
equals(state.get('fullPath'), 'bar.y.z', "should return forth Z state for 'bar.y.z'");
|
|
195
|
+
|
|
196
|
+
state = root.getSubstate('x.a');
|
|
197
|
+
equals(state.get('fullPath'), 'x.a', "should return state A for 'x.a'");
|
|
198
|
+
|
|
199
|
+
state = root.getSubstate('x.b');
|
|
200
|
+
equals(state.get('fullPath'), 'x.b', "should return state B for 'x.b'");
|
|
201
|
+
|
|
202
|
+
state = root.getSubstate('x.a.a1');
|
|
203
|
+
equals(state.get('fullPath'), 'x.a.a1', "should return state A1 for 'x.a.a1'");
|
|
204
|
+
|
|
205
|
+
state = root.getSubstate('x.a.z');
|
|
206
|
+
equals(state.get('fullPath'), 'x.a.z', "should return state Z for 'x.a.z'");
|
|
207
|
+
|
|
208
|
+
state = root.getSubstate('x.b.b1');
|
|
209
|
+
equals(state.get('fullPath'), 'x.b.b1', "should return state B1 for 'x.b.b1'");
|
|
210
|
+
|
|
211
|
+
state = root.getSubstate('x.b.z');
|
|
212
|
+
equals(state.get('fullPath'), 'x.b.z', "should return state Z for 'x.b.z'");
|
|
213
|
+
});
|
|
214
|
+
|
|
215
|
+
test("get substates from foo state using full paths", function() {
|
|
216
|
+
var foo = root.getSubstate('foo'),
|
|
217
|
+
state;
|
|
218
|
+
|
|
219
|
+
state = foo.getSubstate('a.a1');
|
|
220
|
+
equals(state.get('fullPath'), 'foo.a.a1', "should return state A1 for 'a.a1'");
|
|
221
|
+
|
|
222
|
+
state = foo.getSubstate('this.a.a1');
|
|
223
|
+
equals(state.get('fullPath'), 'foo.a.a1', "should return state A1 for 'this.a.a1'");
|
|
224
|
+
|
|
225
|
+
state = foo.getSubstate('a.z');
|
|
226
|
+
equals(state.get('fullPath'), 'foo.a.z', "should return state A1 for 'a.z'");
|
|
227
|
+
|
|
228
|
+
state = foo.getSubstate('this.a.z');
|
|
229
|
+
equals(state.get('fullPath'), 'foo.a.z', "should return state A1 for 'a.z'");
|
|
230
|
+
|
|
231
|
+
state = foo.getSubstate('mah.z');
|
|
232
|
+
ok(!state, "should not return state for 'mah.z'");
|
|
233
|
+
|
|
234
|
+
state = foo.getSubstate('foo.a');
|
|
235
|
+
ok(!state, "should not return state for 'foo.a'");
|
|
236
|
+
});
|
|
237
|
+
|
|
238
|
+
test("get umambiguous substates from foo state using state names", function() {
|
|
239
|
+
var state,
|
|
240
|
+
foo = root.getSubstate('foo');
|
|
241
|
+
|
|
242
|
+
state = foo.getSubstate('a1');
|
|
243
|
+
equals(state.get('fullPath'), 'foo.a.a1', "should return state A1 for 'a1'");
|
|
244
|
+
|
|
245
|
+
state = foo.getSubstate('b1');
|
|
246
|
+
equals(state.get('fullPath'), 'foo.b.b1', "should return state A1 for 'b1'");
|
|
247
|
+
});
|
|
248
|
+
|
|
249
|
+
test("get umambiguous substates from foo state using state names", function() {
|
|
250
|
+
var state,
|
|
251
|
+
foo = root.getSubstate('foo');
|
|
252
|
+
|
|
253
|
+
state = foo.getSubstate('a1');
|
|
254
|
+
equals(state.get('fullPath'), 'foo.a.a1', "should return state A1 for 'a1'");
|
|
255
|
+
|
|
256
|
+
state = foo.getSubstate('b1');
|
|
257
|
+
equals(state.get('fullPath'), 'foo.b.b1', "should return state A1 for 'b1'");
|
|
258
|
+
});
|
|
259
|
+
|
|
260
|
+
test("get z substates from foo state", function() {
|
|
261
|
+
var state,
|
|
262
|
+
foo = root.getSubstate('foo'),
|
|
263
|
+
callbackState, callbackKeys;
|
|
264
|
+
|
|
265
|
+
console.log('expecting a console error message...');
|
|
266
|
+
state = foo.getSubstate('z');
|
|
267
|
+
ok(!state, "should return null for 'z'");
|
|
268
|
+
|
|
269
|
+
state = foo.getSubstate('a~z');
|
|
270
|
+
equals(state.get('fullPath'), 'foo.a.z', "should return state for 'a~z'");
|
|
271
|
+
|
|
272
|
+
state = foo.getSubstate('b~z');
|
|
273
|
+
equals(state.get('fullPath'), 'foo.b.z', "should return state for 'b~z'");
|
|
274
|
+
|
|
275
|
+
state = root.getSubstate('foo.a~z');
|
|
276
|
+
equals(state.get('fullPath'), 'foo.a.z', "should return state for 'foo.a~z'");
|
|
277
|
+
|
|
278
|
+
state = root.getSubstate('foo.b~z');
|
|
279
|
+
equals(state.get('fullPath'), 'foo.b.z', "should return state for 'foo.b~z'");
|
|
280
|
+
});
|
|
281
|
+
|
|
282
|
+
test("get z substate from y state", function() {
|
|
283
|
+
var state,
|
|
284
|
+
foo = root.getSubstate('y');
|
|
285
|
+
|
|
286
|
+
state = root.getSubstate('y.z');
|
|
287
|
+
equals(state.get('fullPath'), 'bar.y.z', "should return state for 'y.z'");
|
|
288
|
+
});
|
|
289
|
+
|
|
290
|
+
test("get a1 substates from root state", function() {
|
|
291
|
+
var state;
|
|
292
|
+
|
|
293
|
+
console.log('expecting a console error message...');
|
|
294
|
+
state = root.getSubstate('a1');
|
|
295
|
+
ok(!state, "should return null for 'a1'");
|
|
296
|
+
|
|
297
|
+
state = root.getSubstate('foo~a1');
|
|
298
|
+
equals(state.get('fullPath'), 'foo.a.a1', "should return state for 'foo~a1'");
|
|
299
|
+
|
|
300
|
+
state = root.getSubstate('foo~a.a1');
|
|
301
|
+
equals(state.get('fullPath'), 'foo.a.a1', "should return state for 'foo~a.a1'");
|
|
302
|
+
|
|
303
|
+
state = root.getSubstate('x~a1');
|
|
304
|
+
equals(state.get('fullPath'), 'x.a.a1', "should return state for 'x~a1'");
|
|
305
|
+
|
|
306
|
+
state = root.getSubstate('x~a.a1');
|
|
307
|
+
equals(state.get('fullPath'), 'x.a.a1', "should return state for 'x~a.a1'");
|
|
308
|
+
});
|
|
309
|
+
|
|
310
|
+
test("get non-existing substate 'abc' with using callback", function() {
|
|
311
|
+
var result, cbState, cbValue, cbKeys;
|
|
312
|
+
|
|
313
|
+
result = root.getSubstate('abc', function(state, value, keys) {
|
|
314
|
+
cbState = state;
|
|
315
|
+
cbValue = value;
|
|
316
|
+
cbKeys = keys;
|
|
317
|
+
});
|
|
318
|
+
|
|
319
|
+
ok(!result, "should not return result for 'abc'");
|
|
320
|
+
equals(cbState, root, "callback state arg should be root state");
|
|
321
|
+
equals(cbValue, 'abc', "callback value arg should be 'abc'");
|
|
322
|
+
ok(!cbKeys, "callback keys arg should be none");
|
|
323
|
+
});
|
|
324
|
+
|
|
325
|
+
test("get ambiguous substate 'x' substate with using callback", function() {
|
|
326
|
+
var result, cbState, cbValue, cbKeys;
|
|
327
|
+
|
|
328
|
+
result = root.getSubstate('x', function(state, value, keys) {
|
|
329
|
+
cbState = state;
|
|
330
|
+
cbValue = value;
|
|
331
|
+
cbKeys = keys;
|
|
332
|
+
});
|
|
333
|
+
console.log(cbKeys);
|
|
334
|
+
ok(!result, "should not return result for 'x'");
|
|
335
|
+
equals(cbState, root, "callback state arg should be root state");
|
|
336
|
+
equals(cbValue, 'x', "callback value arg should be 'x'");
|
|
337
|
+
equals(cbKeys.length, 2, "callback keys arg should be array with length 2");
|
|
338
|
+
ok(cbKeys.indexOf('x') >= 0, "callback keys arg should contain value 'x'");
|
|
339
|
+
ok(cbKeys.indexOf('bar.x') >= 0, "callback keys arg should contain value 'bar.x'");
|
|
340
|
+
});
|