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
|
@@ -20,7 +20,7 @@ sc_require('views/collection') ;
|
|
|
20
20
|
|
|
21
21
|
This view makes no attempt to size or position your child views. It assumes
|
|
22
22
|
you are using StaticLayout for your child views. If you don't enable static
|
|
23
|
-
layout your views will probably overlay on top of
|
|
23
|
+
layout your views will probably overlay on top of each other and will look
|
|
24
24
|
incorrect.
|
|
25
25
|
|
|
26
26
|
Note also that the default layout for this view set's the height to "auto".
|
|
@@ -72,7 +72,7 @@ SC.StackedView = SC.CollectionView.extend(
|
|
|
72
72
|
of the view until the end of the run loop. You can force an immediate
|
|
73
73
|
update by passing YES to the "immediately" parameter.
|
|
74
74
|
|
|
75
|
-
@param {Boolean} immediately YES to update
|
|
75
|
+
@param {Boolean} immediately YES to update immediately
|
|
76
76
|
@returns {SC.StackedView} receiver
|
|
77
77
|
*/
|
|
78
78
|
updateHeight: function(immediately) {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
|
|
13
13
|
Normally, views in SproutCore are absolutely positioned. Their width and
|
|
14
14
|
height are either pre-determined, or specified relative to their enclosing
|
|
15
|
-
view. Occasionally, you may want to display content that is
|
|
15
|
+
view. Occasionally, you may want to display content that is laid out by
|
|
16
16
|
the browser. For example, if you were writing a documentation browser, you
|
|
17
17
|
may want to display the table of contents as an SC.ListView, but the actual
|
|
18
18
|
pages as HTML content.
|
|
@@ -96,7 +96,7 @@ SC.StaticContentView = SC.View.extend(SC.StaticLayout,
|
|
|
96
96
|
|
|
97
97
|
if (!layer) return { x: 0, y: 0, width: 0, height: 0 };
|
|
98
98
|
|
|
99
|
-
if (layer.getBoundingClientRect) {
|
|
99
|
+
if (layer.getBoundingClientRect && !SC.browser.isIE8OrLower) {
|
|
100
100
|
rect = layer.getBoundingClientRect();
|
|
101
101
|
|
|
102
102
|
return { x: 0, y: 0, width: rect.width, height: rect.height };
|
|
@@ -195,7 +195,7 @@ SC.TabView = SC.View.extend(
|
|
|
195
195
|
|
|
196
196
|
/** @private */
|
|
197
197
|
createChildViews: function() {
|
|
198
|
-
var childViews = [],
|
|
198
|
+
var childViews = [], containerView, layout,
|
|
199
199
|
tabLocation = this.get('tabLocation'),
|
|
200
200
|
tabHeight = this.get('tabHeight'),
|
|
201
201
|
controlSize = this.get('controlSize');
|
|
@@ -214,9 +214,8 @@ SC.TabView = SC.View.extend(
|
|
|
214
214
|
ariaRole: 'tabpanel'
|
|
215
215
|
});
|
|
216
216
|
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
217
|
+
this.containerView = this.createChildView(containerView) ;
|
|
218
|
+
|
|
220
219
|
// The segmentedView managed by this tab view. Note that this TabView uses
|
|
221
220
|
// a custom segmented view. You can access this view but you cannot change
|
|
222
221
|
// it.
|
|
@@ -250,9 +249,11 @@ SC.TabView = SC.View.extend(
|
|
|
250
249
|
}
|
|
251
250
|
});
|
|
252
251
|
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
252
|
+
this.segmentedView = this.createChildView(this.segmentedView) ;
|
|
253
|
+
|
|
254
|
+
childViews.push(this.segmentedView);
|
|
255
|
+
childViews.push(this.containerView);
|
|
256
|
+
|
|
256
257
|
this.set('childViews', childViews);
|
|
257
258
|
return this;
|
|
258
259
|
},
|
|
@@ -26,7 +26,7 @@ SC.WebView = SC.View.extend(SC.Control, {/** @scope SC.WebView.prototype */
|
|
|
26
26
|
displayProperties: ['value', 'shouldAutoResize'],
|
|
27
27
|
|
|
28
28
|
/**
|
|
29
|
-
The content of the iframe can be bigger than the size
|
|
29
|
+
The content of the iframe can be bigger than the size specified when creating
|
|
30
30
|
the view. If you want the view to be auto-resized to the dimensions of the
|
|
31
31
|
iframe, then set the value of this property to YES.
|
|
32
32
|
The web view can be auto resized only if the contents are from the same
|
|
@@ -95,7 +95,7 @@ SC.WebView = SC.View.extend(SC.Control, {/** @scope SC.WebView.prototype */
|
|
|
95
95
|
if(contentWindow && contentWindow.document && contentWindow.document.documentElement){
|
|
96
96
|
var docElement = contentWindow.document.documentElement;
|
|
97
97
|
// setting the width before the height gives more accurate results..
|
|
98
|
-
//
|
|
98
|
+
// at least for the test iframe content i'm using.
|
|
99
99
|
//TODO: try out document flows other than top to bottom.
|
|
100
100
|
if (!SC.browser.isIE) {
|
|
101
101
|
this.$().width(docElement.scrollWidth);
|
|
@@ -28,7 +28,7 @@ Greenhouse.filesController = SC.TreeController.create(SC.CollectionViewDelegate,
|
|
|
28
28
|
treeItemChildrenKey: "contents",
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
|
-
Call this method whenever you want to
|
|
31
|
+
Call this method whenever you want to reload the files from the server.
|
|
32
32
|
*/
|
|
33
33
|
reload: function() {
|
|
34
34
|
var fileQuery = Greenhouse.FILES_QUERY, target = Greenhouse.targetController.get('content');
|
data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/controllers/library.js
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
Greenhouse.libraryController = SC.TreeController.create( SC.CollectionViewDelegate,
|
|
16
16
|
/** @scope Greenhouse.libraryController.prototype */ {
|
|
17
17
|
/**
|
|
18
|
-
Call this method whenever you want to
|
|
18
|
+
Call this method whenever you want to reload the library from hte server
|
|
19
19
|
*/
|
|
20
20
|
reload: function() {
|
|
21
21
|
var configQuery = Greenhouse.CONFIG_QUERY, target = Greenhouse.targetController.get('content');
|
data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/controllers/targets.js
CHANGED
|
@@ -20,7 +20,7 @@ Greenhouse.targetsController = SC.ArrayController.create(
|
|
|
20
20
|
/** @scope Greenhouse.targetsController.prototype */ {
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
|
-
Call this method whenever you want to
|
|
23
|
+
Call this method whenever you want to reload the targets from the server.
|
|
24
24
|
*/
|
|
25
25
|
reload: function() {
|
|
26
26
|
var targets = Greenhouse.store.find(Greenhouse.TARGETS_QUERY);
|
data/lib/frameworks/sproutcore/frameworks/experimental/apps/greenhouse/controllers/view_configs.js
CHANGED
|
@@ -14,7 +14,7 @@ Greenhouse.viewConfigsController = SC.ArrayController.create(
|
|
|
14
14
|
/** @scope Greenhouse.viewConfigsController.prototype */ {
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
|
-
Call this method whenever you want to
|
|
17
|
+
Call this method whenever you want to reload the view configs from the server.
|
|
18
18
|
*/
|
|
19
19
|
reload: function() {
|
|
20
20
|
var configQuery = Greenhouse.CONFIG_QUERY, target = Greenhouse.targetController.get('content');
|
|
@@ -50,7 +50,7 @@ Greenhouse.DropDown = {
|
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
-
// TODO: [BB] Check for
|
|
53
|
+
// TODO: [BB] Check for existence of target and action
|
|
54
54
|
if (this.target !== undefined && this.action !== undefined) {
|
|
55
55
|
this.set('target', this);
|
|
56
56
|
this.set('action', 'toggle');
|
|
@@ -133,7 +133,7 @@ Greenhouse.mixin( /** @scope Greenhouse */{
|
|
|
133
133
|
fileSelected: SC.State.design({
|
|
134
134
|
|
|
135
135
|
enterState: function(){
|
|
136
|
-
//TODO: draw message
|
|
136
|
+
//TODO: draw message saying we can't do anything with this right now...
|
|
137
137
|
},
|
|
138
138
|
exitState: function(){}
|
|
139
139
|
}),
|
|
@@ -129,7 +129,7 @@ Greenhouse.PlistItemView = SC.View.extend(SC.Control,
|
|
|
129
129
|
this._checkboxRenderDelegate = renderer;
|
|
130
130
|
},
|
|
131
131
|
/**
|
|
132
|
-
Determines if the event
|
|
132
|
+
Determines if the event occurred inside an element with the specified
|
|
133
133
|
classname or not.
|
|
134
134
|
*/
|
|
135
135
|
_isInsideElementWithClassName: function(className, evt) {
|
|
@@ -22,7 +22,7 @@ Greenhouse.WebView = SC.WebView.extend(
|
|
|
22
22
|
if(contentWindow && contentWindow.document && contentWindow.document.documentElement){
|
|
23
23
|
var docElement = contentWindow.document.documentElement;
|
|
24
24
|
// setting the width before the height gives more accurate results..
|
|
25
|
-
//
|
|
25
|
+
// at least for the test iframe content i'm using.
|
|
26
26
|
//TODO: try out document flows other than top to bottom.
|
|
27
27
|
if (!SC.browser.isIE){
|
|
28
28
|
this.$().width(docElement.scrollWidth);
|
|
@@ -30,7 +30,7 @@ SC.PageDesignController = SC.Object.extend({
|
|
|
30
30
|
selection: null,
|
|
31
31
|
|
|
32
32
|
/**
|
|
33
|
-
Updates the selection either by adding the item or by
|
|
33
|
+
Updates the selection either by adding the item or by resetting the
|
|
34
34
|
selection. Calling this method with no parameters will reset the
|
|
35
35
|
selection.
|
|
36
36
|
|
|
@@ -155,7 +155,7 @@ SC.PageDesignController = SC.Object.extend({
|
|
|
155
155
|
this.deselect(designer);
|
|
156
156
|
designer.set('isRootDesigner', YES);
|
|
157
157
|
designer.set('prevRootDesigner', currRoot);
|
|
158
|
-
//TODO: allow greenhouse to
|
|
158
|
+
//TODO: allow greenhouse to highlight the root view!
|
|
159
159
|
this.set('rootDesigner', designer);
|
|
160
160
|
},
|
|
161
161
|
|
data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/css/css_style_sheet.js
CHANGED
|
@@ -46,7 +46,7 @@ SC.CSSStyleSheet = SC.Object.extend(
|
|
|
46
46
|
},
|
|
47
47
|
|
|
48
48
|
/**
|
|
49
|
-
@property {Boolean} YES if the
|
|
49
|
+
@property {Boolean} YES if the stylesheet is enabled.
|
|
50
50
|
*/
|
|
51
51
|
isEnabled: function(key, val) {
|
|
52
52
|
if (val !== undefined) {
|
|
@@ -144,7 +144,7 @@ SC.mixin(SC.CSSStyleSheet,
|
|
|
144
144
|
var ss2 = SC.CSSStyleSheet.find('style') ; // same thing
|
|
145
145
|
sc_assert(ss === ss2) ; // SC.CSSStyleSheet objects are stable
|
|
146
146
|
|
|
147
|
-
@param {String} nameOrUrl a
|
|
147
|
+
@param {String} nameOrUrl a stylesheet name or href to find
|
|
148
148
|
@returns {SC.CSSStyleSheet} null if not found
|
|
149
149
|
*/
|
|
150
150
|
find: function(nameOrUrl) {
|
|
@@ -352,7 +352,7 @@ SC.ViewDesigner = SC.Object.extend(
|
|
|
352
352
|
|
|
353
353
|
|
|
354
354
|
/*
|
|
355
|
-
Array of properties
|
|
355
|
+
Array of properties available to edit in greenhouse
|
|
356
356
|
|
|
357
357
|
*/
|
|
358
358
|
editableProperties: function(){
|
|
@@ -485,7 +485,7 @@ SC.ViewDesigner = SC.Object.extend(
|
|
|
485
485
|
|
|
486
486
|
|
|
487
487
|
/**
|
|
488
|
-
over-ride this method in your designers to
|
|
488
|
+
over-ride this method in your designers to customize drop operations
|
|
489
489
|
default just calls appendChild
|
|
490
490
|
|
|
491
491
|
TODO: Come up with a better name for this method.
|
data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/mixins/snap_lines.js
CHANGED
|
@@ -38,7 +38,7 @@ SC.SnapLines = {
|
|
|
38
38
|
|
|
39
39
|
|
|
40
40
|
/*
|
|
41
|
-
This method will setup the
|
|
41
|
+
This method will setup the data structure required to draw snap lines
|
|
42
42
|
it should be called in dragStarted if using with an `SC.Drag` or on
|
|
43
43
|
`mouseDown` if using it with a move
|
|
44
44
|
|
|
@@ -123,7 +123,7 @@ SC.SnapLines = {
|
|
|
123
123
|
This method will check the passed views position with the other child views
|
|
124
124
|
and draw any lines. It should be called in `dragUpdated` if using `SC.Drag`
|
|
125
125
|
or in `mouseMoved` if using a move. it will also return a hash of the
|
|
126
|
-
snapped coords in local and global
|
|
126
|
+
snapped coords in local and global coordinates
|
|
127
127
|
|
|
128
128
|
*/
|
|
129
129
|
drawLines: function(view, eventX, eventY, mouseDownX, mouseDownY){
|
|
@@ -137,7 +137,7 @@ SC.SnapLines = {
|
|
|
137
137
|
rMinY, rMidY, rMaxY, rMinXMod, rMidXMod, rMaxXMod, rMinYMod, rMidYMod, rMaxYMod, xHit, yHit,
|
|
138
138
|
moveDirection = this._dragDirection(eventX, eventY, mouseDownX, mouseDownY), xValues, yValues,
|
|
139
139
|
that = this, xHitVals, yHitVals, ret;
|
|
140
|
-
//get the frame and all the
|
|
140
|
+
//get the frame and all the relevant points of interest
|
|
141
141
|
parent = view.get('parentView');
|
|
142
142
|
frame = parent ? parent.convertFrameToView(view.get('frame'), null) : view.get('frame');
|
|
143
143
|
rMinX = SC.minX(frame);
|
|
@@ -91,7 +91,7 @@ SC.DesignerDropTarget = SC.ContainerView.extend(
|
|
|
91
91
|
/**
|
|
92
92
|
Called to actually perform the drag operation.
|
|
93
93
|
|
|
94
|
-
|
|
94
|
+
Override this method to actually perform the drag operation. This method
|
|
95
95
|
is only called if you returned `YES` in `acceptDragOperation()`.
|
|
96
96
|
|
|
97
97
|
Return the operation that was actually performed or `SC.DRAG_NONE` if the
|
|
@@ -59,8 +59,8 @@
|
|
|
59
59
|
?transparency: 0.2
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
|
-
|
|
63
|
-
@author Evin Grano
|
|
62
|
+
|
|
63
|
+
@author Evin Grano
|
|
64
64
|
@extends SC.View
|
|
65
65
|
@since SproutCore 1.0
|
|
66
66
|
*/
|
|
@@ -74,23 +74,23 @@ SC.STROKE = 'stroke';
|
|
|
74
74
|
|
|
75
75
|
|
|
76
76
|
SC.DrawingView = SC.View.extend({
|
|
77
|
-
|
|
77
|
+
|
|
78
78
|
classNames: 'scui-drawing-view',
|
|
79
|
-
|
|
79
|
+
|
|
80
80
|
shapes: [],
|
|
81
|
-
|
|
81
|
+
|
|
82
82
|
_drawingManager: {},
|
|
83
|
-
|
|
83
|
+
|
|
84
84
|
shapesDidChange: function(){
|
|
85
85
|
this.set('layerNeedsUpdate', YES);
|
|
86
86
|
this.updateLayerIfNeeded();
|
|
87
87
|
}.observes('*shapes.[]'),
|
|
88
|
-
|
|
88
|
+
|
|
89
89
|
init: function(){
|
|
90
90
|
sc_super();
|
|
91
|
-
|
|
91
|
+
|
|
92
92
|
// Register Basic Shapes
|
|
93
|
-
|
|
93
|
+
|
|
94
94
|
// Drawing a Line
|
|
95
95
|
this.registerShapeDrawing( SC.LINE, function(ctx, params){
|
|
96
96
|
if (params.style){
|
|
@@ -103,7 +103,7 @@ SC.DrawingView = SC.View.extend({
|
|
|
103
103
|
ctx.lineTo(params.end.x, params.end.y);
|
|
104
104
|
ctx.stroke();
|
|
105
105
|
});
|
|
106
|
-
|
|
106
|
+
|
|
107
107
|
// Drawing a Rectangle
|
|
108
108
|
this.registerShapeDrawing( SC.RECT, function(ctx, params){
|
|
109
109
|
if (params.style){
|
|
@@ -123,7 +123,7 @@ SC.DrawingView = SC.View.extend({
|
|
|
123
123
|
break;
|
|
124
124
|
}
|
|
125
125
|
});
|
|
126
|
-
|
|
126
|
+
|
|
127
127
|
// Drawing a Circle
|
|
128
128
|
this.registerShapeDrawing( SC.CIRCLE, function(ctx, params){
|
|
129
129
|
if (params.style){
|
|
@@ -136,7 +136,7 @@ SC.DrawingView = SC.View.extend({
|
|
|
136
136
|
if (params.type === SC.FILL) ctx.fill();
|
|
137
137
|
else ctx.stroke();
|
|
138
138
|
});
|
|
139
|
-
|
|
139
|
+
|
|
140
140
|
// Drawing a Polygon
|
|
141
141
|
this.registerShapeDrawing( SC.POLY, function(ctx, params){
|
|
142
142
|
if (params.style){
|
|
@@ -147,7 +147,7 @@ SC.DrawingView = SC.View.extend({
|
|
|
147
147
|
ctx.beginPath();
|
|
148
148
|
var len = params.path ? params.path.length : 0;
|
|
149
149
|
if (len < 2) return;
|
|
150
|
-
|
|
150
|
+
|
|
151
151
|
var path = params.path, curr;
|
|
152
152
|
ctx.moveTo(path[0].x, path[0].y);
|
|
153
153
|
for(var i = 1; i < len; i++){
|
|
@@ -159,12 +159,12 @@ SC.DrawingView = SC.View.extend({
|
|
|
159
159
|
else ctx.stroke();
|
|
160
160
|
});
|
|
161
161
|
},
|
|
162
|
-
|
|
162
|
+
|
|
163
163
|
render: function(context, firstTime) {
|
|
164
164
|
//console.log('%@.render()'.fmt(this));
|
|
165
165
|
var frame = this.get('frame');
|
|
166
166
|
if (firstTime) {
|
|
167
|
-
if (!SC.browser.
|
|
167
|
+
if (!SC.browser.isIE) {
|
|
168
168
|
context.push('<canvas class="base-layer" width="%@" height="%@">You can\'t use canvas tags</canvas>'.fmt(frame.width, frame.height));
|
|
169
169
|
}
|
|
170
170
|
}
|
|
@@ -191,26 +191,26 @@ SC.DrawingView = SC.View.extend({
|
|
|
191
191
|
SC.Logger.error("SC.DrawingView.render(): Canvas element is not accessible.");
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
|
-
|
|
194
|
+
|
|
195
195
|
return sc_super();
|
|
196
196
|
},
|
|
197
|
-
|
|
197
|
+
|
|
198
198
|
registerShapeDrawing: function(name, drawingFunction){
|
|
199
199
|
if (!name) {
|
|
200
200
|
SC.Logger.error('Can\'t register this drawing paradigm because name is null');
|
|
201
201
|
return NO;
|
|
202
202
|
}
|
|
203
|
-
|
|
203
|
+
|
|
204
204
|
// OK, create the drawing paradigm
|
|
205
205
|
this._drawingManager[name] = drawingFunction;
|
|
206
206
|
this.set('layerNeedsUpdate', YES);
|
|
207
207
|
this.updateLayerIfNeeded();
|
|
208
208
|
return YES;
|
|
209
209
|
},
|
|
210
|
-
|
|
210
|
+
|
|
211
211
|
/**
|
|
212
|
-
@private
|
|
213
|
-
|
|
212
|
+
@private
|
|
213
|
+
|
|
214
214
|
Function for actually drawing the shapes that we have listed
|
|
215
215
|
*/
|
|
216
216
|
_drawShapes: function(cntx){
|
data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/designer/views/page_item_view.js
CHANGED
|
@@ -74,7 +74,7 @@ SC.pageItemView = SC.ListItemView.extend(
|
|
|
74
74
|
/**
|
|
75
75
|
Called to actually perform the drag operation.
|
|
76
76
|
|
|
77
|
-
|
|
77
|
+
Override this method to actually perform the drag operation. This method
|
|
78
78
|
is only called if you returned `YES` in `acceptDragOperation()`.
|
|
79
79
|
|
|
80
80
|
Return the operation that was actually performed or `SC.DRAG_NONE` if the
|
|
@@ -92,70 +92,76 @@ SC.FormView = SC.View.extend(SC.FlowedLayout, SC.CalculatesEmptiness, SC.FormsEd
|
|
|
92
92
|
/**
|
|
93
93
|
*/
|
|
94
94
|
createChildViews: function() {
|
|
95
|
-
var
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
95
|
+
var childViews = this.get('childViews'),
|
|
96
|
+
len = childViews.length,
|
|
97
|
+
idx, key, views, view,
|
|
98
|
+
attrs, exampleRow = this.get('exampleRow');
|
|
99
|
+
|
|
100
|
+
this.beginPropertyChanges() ;
|
|
101
|
+
|
|
102
|
+
// swap the array
|
|
103
|
+
for (idx=0; idx<len; ++idx) {
|
|
104
|
+
if (key = (view = childViews[idx])) {
|
|
105
|
+
|
|
106
|
+
// is this is a key name, lookup view class
|
|
107
|
+
if (typeof key === SC.T_STRING) {
|
|
108
|
+
view = this[key];
|
|
109
|
+
} else {
|
|
110
|
+
key = null ;
|
|
106
111
|
}
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
112
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
+
if (!view) {
|
|
114
|
+
SC.Logger.error ("No view with name "+key+" has been found in "+this.toString());
|
|
115
|
+
// skip this one.
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
113
118
|
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
if
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
//
|
|
126
|
-
// instead, we give ALL views a formKey for their convenience; if they want to
|
|
127
|
-
// use contentValue support they should do so directly.
|
|
128
|
-
v.set('formKey', key);
|
|
129
|
-
|
|
130
|
-
// We used to try to be clever and bind child views' 'content' to
|
|
131
|
-
// individual properties if the views didn't have content value support.
|
|
132
|
-
// For instance, a plain view named 'myView' would get bound to content.myView.
|
|
133
|
-
//
|
|
134
|
-
// Cleverness is evil, so, we have dropped this. Instead, we always bind content,
|
|
135
|
-
// and always do so directly.
|
|
136
|
-
if (!v.get("content")) {
|
|
137
|
-
v.bind('content', this, 'content');
|
|
138
|
-
}
|
|
119
|
+
if(!view.isClass && SC.typeOf(view) === SC.T_HASH) {
|
|
120
|
+
attrs = view;
|
|
121
|
+
view = exampleRow;
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
attrs = {};
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
if((attrs.isFormField || view.prototype.isFormField) && (attrs.hasContentValueSupport || view.prototype.hasContentValueSupport)) {
|
|
128
|
+
attrs.contentValueKey = key;
|
|
129
|
+
}
|
|
139
130
|
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
131
|
+
attrs.formKey = key;
|
|
132
|
+
|
|
133
|
+
// createChildView creates the view if necessary, but also sets
|
|
134
|
+
// important properties, such as parentView
|
|
135
|
+
view = this.createChildView(view, attrs) ;
|
|
136
|
+
|
|
137
|
+
if(!view.get('content')) {
|
|
138
|
+
view.bind('content', this, 'content');
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
// for form rows, set up label measuring and the label itself.
|
|
142
|
+
if (view.isFormRow) {
|
|
143
|
+
// set label (if possible).
|
|
144
|
+
if (SC.none(view.get('label'))) {
|
|
145
|
+
view.set("label", key.humanize().titleize());
|
|
151
146
|
}
|
|
152
147
|
|
|
148
|
+
// set the label size measuring stuff
|
|
149
|
+
if (this.get('labelWidth') !== null) {
|
|
150
|
+
view.set("shouldMeasureLabel", NO);
|
|
151
|
+
}
|
|
153
152
|
}
|
|
153
|
+
|
|
154
|
+
if (key) { this[key] = view ; } // save on key name if passed
|
|
154
155
|
}
|
|
156
|
+
childViews[idx] = view;
|
|
155
157
|
}
|
|
156
158
|
|
|
159
|
+
this.endPropertyChanges() ;
|
|
160
|
+
|
|
157
161
|
this._hasCreatedRows = YES;
|
|
158
162
|
this.recalculateLabelWidth();
|
|
163
|
+
|
|
164
|
+
return this ;
|
|
159
165
|
},
|
|
160
166
|
|
|
161
167
|
|
|
@@ -216,7 +222,7 @@ SC.FormView = SC.View.extend(SC.FlowedLayout, SC.CalculatesEmptiness, SC.FormsEd
|
|
|
216
222
|
if (this._rowLabelSize !== ret) {
|
|
217
223
|
this._rowLabelSize = ret;
|
|
218
224
|
|
|
219
|
-
// set by looping
|
|
225
|
+
// set by looping through child views
|
|
220
226
|
for (idx = 0; idx < len; idx++) {
|
|
221
227
|
child = children[idx];
|
|
222
228
|
|