sproutcore 1.5.0.pre.5 → 1.5.0.rc.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +20 -0
- data/VERSION.yml +1 -1
- data/lib/buildtasks/manifest.rake +171 -78
- data/lib/frameworks/sproutcore/Buildfile +7 -6
- data/lib/frameworks/sproutcore/CHANGELOG.md +56 -0
- data/lib/frameworks/sproutcore/apps/docs/core.js +1 -1
- data/lib/frameworks/sproutcore/apps/docs/english.lproj/main_page.js +1 -1
- data/lib/frameworks/sproutcore/apps/docs/english.lproj/strings.js +1 -1
- data/lib/frameworks/sproutcore/apps/docs/main.js +1 -1
- data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/dialogs.js +3 -3
- data/lib/frameworks/sproutcore/apps/test_controls/controllers/alert.js +39 -0
- data/lib/frameworks/sproutcore/apps/test_controls/controllers/buttons.js +1 -1
- data/lib/frameworks/sproutcore/apps/test_controls/controllers/categories.js +19 -2
- data/lib/frameworks/sproutcore/apps/test_controls/controllers/category.js +1 -1
- data/lib/frameworks/sproutcore/apps/test_controls/controllers/split.js +74 -0
- data/lib/frameworks/sproutcore/apps/test_controls/core.js +1 -1
- data/lib/frameworks/sproutcore/apps/test_controls/main.js +1 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/buttons_page.js +11 -7
- data/lib/frameworks/sproutcore/apps/test_controls/resources/checkboxes_page.js +2 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/flow_layout_page.js +2 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/list_page.js +1 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/main_page.js +7 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/panels_page.js +62 -0
- data/lib/frameworks/sproutcore/apps/test_controls/resources/progress_page.js +2 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/radio_page.js +2 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/scroll_page.js +2 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/segmented_page.js +2 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/select_page.js +2 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/sliders_page.js +2 -1
- data/lib/frameworks/sproutcore/apps/test_controls/resources/split_page.js +141 -0
- data/lib/frameworks/sproutcore/apps/test_controls/resources/tab_page.js +3 -2
- data/lib/frameworks/sproutcore/apps/test_controls/resources/text_field_page.js +28 -4
- data/lib/frameworks/sproutcore/apps/test_controls/theme.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/controllers/detail.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/controllers/source.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/controllers/target.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/controllers/targets.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/controllers/tests.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/core.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/english.lproj/main_page.js +6 -6
- data/lib/frameworks/sproutcore/apps/tests/english.lproj/strings.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/main.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/states/no_targets.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/states/ready.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_loading.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/states/ready_no_tests.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/states/start.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/tests/controllers/detail.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/tests/controllers/source.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/tests/controllers/target.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/tests/controllers/targets.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/tests/controllers/tests.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/tests/models/target.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/tests/models/test.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/tests/views/offset_checkbox.js +1 -1
- data/lib/frameworks/sproutcore/apps/tests/views/offset_checkbox.js +1 -1
- data/lib/frameworks/sproutcore/apps/welcome/controllers/targets.js +1 -1
- data/lib/frameworks/sproutcore/apps/welcome/core.js +1 -1
- data/lib/frameworks/sproutcore/apps/welcome/english.lproj/main_page.js +1 -1
- data/lib/frameworks/sproutcore/apps/welcome/english.lproj/strings.js +1 -1
- data/lib/frameworks/sproutcore/apps/welcome/main.js +1 -1
- data/lib/frameworks/sproutcore/apps/welcome/tests/controllers/targets.js +1 -1
- data/lib/frameworks/sproutcore/design/{SproutCore Datastore Design.graffle → Sproutcore_DatastoreDesign.graffle}/QuickLook/Preview.pdf +0 -0
- data/lib/frameworks/sproutcore/design/{SproutCore Datastore Design.graffle → Sproutcore_DatastoreDesign.graffle}/QuickLook/Thumbnail.tiff +0 -0
- data/lib/frameworks/sproutcore/design/{SproutCore Datastore Design.graffle → Sproutcore_DatastoreDesign.graffle}/data.plist +0 -0
- data/lib/frameworks/sproutcore/design/{SproutCore Datastore Design.graffle → Sproutcore_DatastoreDesign.graffle}/image8.png +0 -0
- data/lib/frameworks/sproutcore/design/{SproutCore Design Template.graffle → Sproutcore_Design_Template.graffle}/QuickLook/Preview.pdf +0 -0
- data/lib/frameworks/sproutcore/design/{SproutCore Design Template.graffle → Sproutcore_Design_Template.graffle}/QuickLook/Thumbnail.tiff +0 -0
- data/lib/frameworks/sproutcore/design/{SproutCore Design Template.graffle → Sproutcore_Design_Template.graffle}/data.plist +0 -0
- data/lib/frameworks/sproutcore/design/{SproutCore Design Template.graffle → Sproutcore_Design_Template.graffle}/image8.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/QuickLook/Preview.pdf +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/QuickLook/Thumbnail.tiff +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/data.plist +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image10.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image11.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image13.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image15.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image16.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image17.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image18.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image19.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image22.tiff +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image23.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image24.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image25.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image30.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image31.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image8.png +0 -0
- data/lib/frameworks/sproutcore/design/{TestRunner Design.graffle → TestRunner_Design.gaffle}/image9.png +0 -0
- data/lib/frameworks/sproutcore/frameworks/bootstrap/core.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/bootstrap/setup_body_class_names.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/bootstrap/system/bench.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/bootstrap/system/browser.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/bootstrap/system/loader.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/array.js +58 -7
- data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/controller.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/controllers/object.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/core.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/object.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/ext/run_loop.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 +1 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/selection_support.js +6 -7
- data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/string.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/mixins/template_helpers/checkbox_support.js +28 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/{views/template → mixins/template_helpers}/text_field_support.js +10 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/keyboard.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/layout.js +25 -38
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/main.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/manipulation.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/pane.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/template.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/panes/visibility.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/protocols/observable_protocol.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/protocols/sparse_array_delegate.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/resources/core.css +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/resources/view.css +2 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/application.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/bindable_span.js +164 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/browser.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/builder.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/core_query.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/cursor.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/device.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/event.js +45 -17
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/json.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/locale.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/page.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/platform.js +24 -4
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/ready.js +48 -22
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/render_context.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/responder.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/root_responder.js +34 -5
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/selection_set.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/sparse_array.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/theme.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/timer.js +6 -5
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/utils.js +8 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/system/utils/rect.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/array_case.js +84 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/enum_case.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/null_case.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/selection_support.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/array/single_case.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/empty_case.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/multiple_case.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/single_case.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/controllers/object/single_enumerable_case.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/responder_context.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/mixins/string.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/{views/template → mixins/template_helpers}/checkbox_support.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/{views/template → mixins/template_helpers}/text_field_support.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/panes/template.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/builder.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/core_query/within.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/json.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/locale.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/ready/done.js +8 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/begin.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/element.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/end.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/get.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/helpers_attr.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/helpers_basic.js +1 -1
- 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 +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/init.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/join.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/push_text.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/tag.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/update.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/makeKeyPane.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/makeMainPane.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/makeMenuPane.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/root_responder.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/root_responder/targetForAction.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/selection_set/add.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/selection_set/copy.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/selection_set/indexSetForSource.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/selection_set/isEqual.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/selection_set/remove.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/sparse_array.js +8 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/theme.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/timer/invalidate.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/timer/invokeLater.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/timer/isPaused.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/timer/performAction.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/timer/schedule.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/utils/normalizeURL.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/utils/offset.js +23 -10
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/utils/rect.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/main_pane.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/append_remove.js +7 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/child_view.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/firstResponder.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/keyPane.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/layout.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/pane/sendEvent.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/{template_view → template}/collection.js +77 -11
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/template/core.js +160 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/{template_view → template}/handlebars.js +279 -8
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/animation.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/build.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/clippingFrame.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/convertFrames.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/convertLayouts.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/createChildViews.js +8 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/createLayer.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/destroyLayer.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/didAppendToDocument.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/findLayerInParentLayer.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/init.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/insertBefore.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/isVisible.js +7 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/isVisibleInWindow.js +7 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/keyboard.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layer.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutChildViews.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutDidChange.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/layoutStyle.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/parentViewDidChange.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/prepareContext.js +4 -4
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/removeChild.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/render.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/render_delegate_support.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/replaceChild.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/static_layout.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/theme.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/updateLayer.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/updateLayerLocation.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/view.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/view/viewDidResize.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/template.js +58 -8
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/template_collection.js +179 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js +92 -65
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/base.js +2 -0
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/keyboard.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout.js +37 -15
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/layout_style.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/theming.js +67 -29
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/visibility.js +6 -1
- data/lib/frameworks/sproutcore/frameworks/core_tools/core.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_tools/data_source.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_tools/english.lproj/strings.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_tools/fixtures/target.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_tools/fixtures/test.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_tools/models/target.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/core_tools/models/test.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/core.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/data_sources/cascade.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/data_sources/data_source.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/data_sources/fixtures.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/debug/json.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/debug/standard_setup.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/models/child_attribute.js +23 -12
- data/lib/frameworks/sproutcore/frameworks/datastore/models/children_attribute.js +1 -0
- data/lib/frameworks/sproutcore/frameworks/datastore/models/fetched_attribute.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/models/many_attribute.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/models/record.js +211 -90
- data/lib/frameworks/sproutcore/frameworks/datastore/models/record_attribute.js +121 -91
- data/lib/frameworks/sproutcore/frameworks/datastore/models/single_attribute.js +15 -17
- data/lib/frameworks/sproutcore/frameworks/datastore/system/child_array.js +50 -14
- data/lib/frameworks/sproutcore/frameworks/datastore/system/many_array.js +35 -20
- data/lib/frameworks/sproutcore/frameworks/datastore/system/nested_store.js +13 -9
- data/lib/frameworks/sproutcore/frameworks/datastore/system/query.js +56 -73
- data/lib/frameworks/sproutcore/frameworks/datastore/system/record_array.js +35 -22
- data/lib/frameworks/sproutcore/frameworks/datastore/system/store.js +138 -62
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/data_sources/cascade.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/data_sources/fixtures.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/contact_model.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/cyclical_relationship.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/mail_model.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/test_runner_model.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/datetime_recordattribute.js +1 -1
- 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 +5 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/core_methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/destroy.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/error_methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/normalize.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/readAttribute.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/refresh.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/storeDidChangeProperties.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/unknownProperty.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/writeAttribute.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 +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/many_array/core_methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/chain.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/commitChanges.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/commitChangesFromNestedStore.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/core_methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/dataHashDidChange.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/discardChanges.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/nested_store/readEditableDataHash.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/removeDataHash.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/writeDataHash.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/builders.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/compare.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/contains.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/containsRecordTypes.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/copy.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/evaluation.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/evaluation_of_records.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/expandedRecordTypes.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/parse.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/queryWithScope.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/record_type_is.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/registered_comparisons.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/registered_query_extensions.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/error_methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/record_array/flush.js +49 -12
- 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 +11 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/core_methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/createRecord.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/dataHashDidChange.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/dataSourceCallbacks.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/destroyRecord.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/error_methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/find.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/init.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/pushChanges.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/readDataHash.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/readEditableDataHash.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/recordDidChange.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/removeDataHash.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/retrieveRecord.js +17 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/unloadRecords.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/writeDataHash.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datetime/resources/strings.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datetime/system/datetime.js +48 -7
- data/lib/frameworks/sproutcore/frameworks/datetime/tests/system/datetime.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/debug/core.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/debug/invoke_once_last_debugging.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/designer/coders/design.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/coders/object.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/controllers/controllers.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/designer/controllers/design.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/designer/controllers/designs.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/designer/controllers/page_design.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/controllers/page_files.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/designer/core.js +6 -4
- data/lib/frameworks/sproutcore/frameworks/designer/css/css_rule.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/designer/css/css_style.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/designer/css/css_style_sheet.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/designer/designers/button.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/designers/label.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/designers/object_designer.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/designers/tab.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/designers/text_field.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/designers/view_designer.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/ext/binding.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/designer/ext/object.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/ext/page.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/ext/view.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/mixins/button.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/designer/mixins/snap_lines.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/designer/tests/designers/view_designer.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/core.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/debug/drag.js +6 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/english.lproj/disclosure.css +0 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/english.lproj/icons.css +0 -27
- data/lib/frameworks/sproutcore/frameworks/desktop/english.lproj/menu_item_view.css +1 -9
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/border.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_fast_path.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_group.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/mixins/navigation_builder.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/scrollable.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/alert.js +293 -203
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js +35 -107
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/modal.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/palette.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/panel.js +10 -36
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/picker.js +44 -4
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/select_button.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/sheet.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drag_data_source.js +6 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drag_source.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/protocols/drop_target.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/protocols/responder.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/button.js +70 -63
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/checkbox.js +29 -31
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/collection.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/disclosure.js +12 -22
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/helpers/slicing.js +4 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/image_button.js +9 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/master_detail.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/menu.js +46 -33
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/panel.js +16 -16
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/picker.js +3 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/popup_button.js +21 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/progress.js +56 -143
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/radio.js +17 -28
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/radio_group.js +8 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/segment.js +5 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/segmented.js +7 -4
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/slider.js +38 -15
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/source_list.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/toolbar.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/well.js +3 -13
- data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/workspace.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/system/drag.js +17 -7
- data/lib/frameworks/sproutcore/frameworks/desktop/system/key_bindings.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/system/undo_manager.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/integration/dialog.js +19 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/mixins/border.js +10 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/alert/ui.js +215 -53
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/menu/methods.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/menu/ui.js +33 -8
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/palette/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/palette/ui.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/pane_page.js +4 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/ui.js +4 -18
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/methods.js +91 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/ui.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/select_button/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/select_button/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/sheet/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/sheet/ui.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/{foundation/tests/mixins → desktop/tests/views}/button/content.js +9 -15
- data/lib/frameworks/sproutcore/frameworks/{foundation/tests/mixins → desktop/tests/views}/button/displayProperties.js +4 -4
- data/lib/frameworks/sproutcore/frameworks/{foundation/tests/mixins → desktop/tests/views}/button/keyEquivalents.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/ui.js +5 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/checkbox/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/checkbox/ui.js +4 -7
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/content.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/deleteSelection.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/deselect.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/displayProperties.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/itemViewForContentIndex.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/layerIdFor.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/length.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/mouse.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/nowShowing.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/reload.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/select.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/selectNextItem.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/selectPreviousItem.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/selection.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/ui_diagram.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/date_field/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/date_field/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/disclosure/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/disclosure/ui.js +9 -11
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/grid/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/grid/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/image_button/ui.js +0 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/render.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowDelegate.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowHeightForContentIndex.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowOffsetForContentIndex.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_alternatingrows.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_outline.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_row_heights.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_simple.js +5 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list_item.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/menu_item/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/menu_item/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/progress/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/progress/ui.js +37 -40
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/radio/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/radio/ui.js +10 -21
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scene_view/databind.js +111 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/integration.js +50 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/ui.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroller.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/methods.js +1 -47
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/ui.js +16 -16
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/select_field/ui.js +69 -6
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/separator.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/source_list/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/source_list/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/split/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/split/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/stacked/ui_comments.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/static_content.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/toolbar/method.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/toolbar/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/web/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/web/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/well/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/button.js +329 -13
- data/lib/frameworks/sproutcore/frameworks/desktop/views/checkbox.js +4 -26
- data/lib/frameworks/sproutcore/frameworks/desktop/views/collection.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/date_field.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/disclosure.js +1 -9
- data/lib/frameworks/sproutcore/frameworks/desktop/views/file.js +1 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/grid.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/views/image_button.js +15 -13
- data/lib/frameworks/sproutcore/frameworks/desktop/views/list.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/list_item.js +76 -75
- data/lib/frameworks/sproutcore/frameworks/desktop/views/master_detail.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_item.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_scroll.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/navigation.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/navigation_bar.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/popup_button.js +8 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/views/progress.js +18 -6
- data/lib/frameworks/sproutcore/frameworks/desktop/views/radio.js +6 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scene.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll.js +13 -14
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scroller.js +20 -7
- data/lib/frameworks/sproutcore/frameworks/desktop/views/segment.js +10 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/views/segmented.js +15 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/views/select.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js +11 -9
- data/lib/frameworks/sproutcore/frameworks/desktop/views/separator.js +7 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/views/slider.js +10 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/source_list.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/source_list_group.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/split.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/split_divider.js +1 -2
- data/lib/frameworks/sproutcore/frameworks/desktop/views/stacked.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/static_content.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/tab.js +11 -10
- data/lib/frameworks/sproutcore/frameworks/desktop/views/thumb.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/toolbar.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/web.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/well.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/workspace.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/device_motion/device.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/device_motion/platform.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/README.md +35 -23
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/models/record.js +83 -9
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/many.js +79 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/simple.js +66 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphism/single.js +67 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/mixins/split_child.js +229 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/mixins/split_thumb.js +236 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/render_delegates/split.js +18 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/render_delegates/split_divider.js +26 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/children.js +100 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/dividers.js +243 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/methods.js +294 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/split_child.js +135 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/tests/split_thumb.js +160 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/views/split.js +929 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/views/split_divider.js +40 -0
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/split_view/views/thumb.js +26 -0
- data/lib/frameworks/sproutcore/frameworks/forms/mixins/edit_mode.js +5 -0
- data/lib/frameworks/sproutcore/frameworks/forms/mixins/emptiness.js +1 -2
- data/lib/frameworks/sproutcore/frameworks/forms/renderer_delegates/form.js +1 -2
- data/lib/frameworks/sproutcore/frameworks/forms/renderer_delegates/form_row.js +1 -2
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_checkbox_field.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_field.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_label.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_radio_field.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_row.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_text_field.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/forms/views/form.js +7 -3
- data/lib/frameworks/sproutcore/frameworks/forms/views/form_row.js +5 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/controllers/tree.js +39 -38
- data/lib/frameworks/sproutcore/frameworks/foundation/debug/control_test_pane.js +1 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/delegates/inline_text_field.js +92 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/english.lproj/bootstrap.rhtml +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/english.lproj/label.css +5 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/gestures/pinch.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/gestures/swipe.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/gestures/tap.js +6 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_mixin.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_resize.js +239 -126
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/button.js +4 -350
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/collection_content.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_display.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_value_support.js +217 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/control.js +17 -186
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/editable.js +3 -7
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/flowed_layout.js +345 -287
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/gestureable.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_editable.js +249 -59
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_editor.js +197 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_editor_delegate.js +177 -114
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_text_field.js +404 -340
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inner_frame.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/static_layout.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/string.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/tree_item_content.js +47 -47
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/validatable.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/private/tree_item_observer.js +205 -200
- data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/container.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/helpers/sizing.js +174 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/label.js +16 -32
- data/lib/frameworks/sproutcore/frameworks/foundation/render_delegates/render_delegate.js +375 -6
- data/lib/frameworks/sproutcore/frameworks/foundation/system/benchmark.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/cookie.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/system/core_query.js +8 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/exception_handler.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/gesture.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/image_queue.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/math.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/module.js +34 -26
- data/lib/frameworks/sproutcore/frameworks/foundation/system/request.js +44 -29
- data/lib/frameworks/sproutcore/frameworks/foundation/system/response.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/routes.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/staticqueue.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/system/task_queue.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/text_selection.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/time.js +6 -5
- data/lib/frameworks/sproutcore/frameworks/foundation/system/user_defaults.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/system/utils/colors.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/system/utils/misc.js +28 -7
- data/lib/frameworks/sproutcore/frameworks/foundation/system/utils/range.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/system/utils/string_measurement.js +7 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tasks/preload_bundle.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tasks/task.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/controllers/tree/outline_case.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/controllers/tree/selection_support.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/debug/control_test_pane/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/debug/control_test_pane/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/delegates/inline_text_field/inline_text_field.js +150 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/integration/creating_views.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/content_display.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/{control → content_value_support}/content.js +8 -8
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/control/displayProperties.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editable/beginEditing.js +194 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editable/commitEditing.js +150 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editable/discardEditing.js +151 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editor/beginEditing.js +114 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editor/commitEditing.js +151 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_editor/discardEditing.js +152 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/api.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/beginEditing.js +10 -9
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/staticLayout.js +6 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/string.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/validatable/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/flat_case.js +59 -59
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/group_case.js +114 -114
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/outline_case.js +74 -74
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/render_delegates/render_delegate.js +78 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/cookie.js +4 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/core_query/setClass.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/math.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/request.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/routes.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/task_queue.js +8 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/user_defaults.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/pointInElement.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/range.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/validators/credit_card.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/validators/date.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/validators/not_empty.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/validators/number.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/validators/password.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/validators/validator.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/image/ui.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/label/ui.js +7 -15
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/methods.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/nextValidKeyView.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/ui.js +1 -1
- 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/email.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/not_empty.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/number.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/password.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/positive_integer.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/validator.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/views/container.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/views/field.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/views/image.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/foundation/views/label.js +47 -33
- data/lib/frameworks/sproutcore/frameworks/foundation/views/text_field.js +28 -4
- data/lib/frameworks/sproutcore/frameworks/handlebars/extensions.js +88 -2
- data/lib/frameworks/sproutcore/frameworks/handlebars/extensions/bind.js +100 -46
- data/lib/frameworks/sproutcore/frameworks/handlebars/extensions/collection.js +21 -46
- data/lib/frameworks/sproutcore/frameworks/handlebars/extensions/view.js +28 -49
- data/lib/frameworks/sproutcore/frameworks/handlebars/handlebars.js +62 -28
- data/lib/frameworks/sproutcore/frameworks/jquery/jquery-buffer.js +28 -18
- data/lib/frameworks/sproutcore/frameworks/jquery/jquery-buffered.js +5 -0
- data/lib/frameworks/sproutcore/frameworks/jquery/jquery-sc.js +5 -0
- data/lib/frameworks/sproutcore/frameworks/jquery/tests/set_class.js +40 -0
- data/lib/frameworks/sproutcore/frameworks/media/views/audio.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/media/views/controls.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/media/views/media_slider.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/media/views/mini_controls.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/media/views/simple_controls.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/media/views/video.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/mini/license.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/core.js +166 -137
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/base.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/indexOf.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/insertAt.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/objectAt.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/popObject.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/pushObject.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/rangeObserver.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/removeAt.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/removeObject.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/replace.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/shiftObject.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/unshiftObject.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/license.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/array.js +50 -13
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/comparable.js +7 -4
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/copyable.js +10 -3
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/enumerable.js +437 -120
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/freezable.js +24 -25
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/observable.js +916 -825
- data/lib/frameworks/sproutcore/frameworks/runtime/private/chain_observer.js +9 -6
- data/lib/frameworks/sproutcore/frameworks/runtime/private/observer_queue.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/private/observer_set.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/private/property_chain.js +190 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js +88 -95
- data/lib/frameworks/sproutcore/frameworks/runtime/system/enumerator.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/runtime/system/error.js +13 -11
- data/lib/frameworks/sproutcore/frameworks/runtime/system/index_set.js +40 -30
- data/lib/frameworks/sproutcore/frameworks/runtime/system/logger.js +40 -38
- data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js +100 -98
- data/lib/frameworks/sproutcore/frameworks/runtime/system/range_observer.js +5 -2
- data/lib/frameworks/sproutcore/frameworks/runtime/system/run_loop.js +11 -12
- data/lib/frameworks/sproutcore/frameworks/runtime/system/set.js +5 -3
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/IsEqual.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/beget.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/clone.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/compare.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/console.js +5 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/guidFor.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/inspect.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/itemType.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/keys.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/makeArray.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/objectForPropertyPath.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/tupleForPropertyPath.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/array.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/comparable.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/{enumerable.js → enumerable/enumerable.js} +1 -2
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/enumerable/enumerable_observers.js +92 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/chained.js +32 -19
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/observable.js +138 -3
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/observersForKey.js +36 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/propertyChanges.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/observable/registerDependentKeys.js +33 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/propertyChanges.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/private/observer_queue/isObservingSuspended.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/binding.js +61 -7
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/error.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/add.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/addEach.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/clone.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/contains.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/create.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/indexAfter.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/indexBefore.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/intersects.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/max.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/min.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/rangeStartForIndex.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/remove.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/removeEach.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/index_set/without.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/logger.js +5 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/object/base.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/object/bindings.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/object/concatenated_properties.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/object/enhance.js +19 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/observer_set.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/range_observer/create.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/range_observer/destroy.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/range_observer/objectPropertyDidChange.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/range_observer/rangeDidChange.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/range_observer/update.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/run_loop.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/set.js +6 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/core.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/statechart/debug/monitor.js +23 -4
- data/lib/frameworks/sproutcore/frameworks/statechart/system/state.js +661 -54
- data/lib/frameworks/sproutcore/frameworks/statechart/system/statechart.js +990 -324
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/advanced/respond_to_event.js +401 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/{advanced_event_handling.js → advanced/without_concurrent_states.js} +1 -5
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{with_concurrent_states/send_event.js → event_handling/basic/with_concurrent_states.js} +0 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{without_concurrent_states/send_event.js → event_handling/basic/without_concurrent_states.js} +0 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{without_concurrent_states/default_responder.js → event_handling/responder/pane.js} +1 -2
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/responder/responder_chain.js +109 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/event_handling/responder/root_responder.js +74 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/initial_substate.js +67 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/is_current_state.js +0 -4
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{namespace/access_substates.js → state/namespacing.js} +0 -4
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/plugin/mixin.js +68 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{without_concurrent_states/state_plugin.js → state/plugin/nesting.js} +1 -5
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state/state_observes.js +235 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{async.js → state_transitioning/async/core.js} +0 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{with_concurrent_states/goto_state_async.js → state_transitioning/async/with_concurrent_states.js} +0 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{without_concurrent_states/goto_state_async.js → state_transitioning/async/without_concurrent_states.js} +4 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/history_state/initial_substate/core.js +48 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/history_state/initial_substate/without_concurrent_states.js +218 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{with_concurrent_states/goto_history_state.js → state_transitioning/history_state/standard/with_concurrent_states.js} +1 -1
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/history_state/standard/without_concurrent_states/context.js +191 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{without_concurrent_states/goto_history_state.js → state_transitioning/history_state/standard/without_concurrent_states/core.js} +0 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{with_concurrent_states/goto_state_advanced.js → state_transitioning/standard/with_concurrent_states/advanced.js} +37 -32
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{with_concurrent_states/goto_state_basic.js → state_transitioning/standard/with_concurrent_states/basic.js} +17 -25
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{with_concurrent_states/goto_state_intermediate.js → state_transitioning/standard/with_concurrent_states/intermediate.js} +22 -21
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/state_transitioning/standard/without_concurrent_states/context.js +144 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{without_concurrent_states/goto_state.js → state_transitioning/standard/without_concurrent_states/core.js} +49 -24
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/{without_concurrent_states/transient.js → state_transitioning/transient/without_concurrent_states.js} +1 -1
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/statechart/create/assigned_root_state.js +76 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/statechart/create/unassigned_root_state.js +162 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/statechart/destroy.js +73 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/statechart/invoke_state_method.js +241 -0
- data/lib/frameworks/sproutcore/frameworks/statechart/tests/statechart/owner.js +236 -0
- data/lib/frameworks/sproutcore/frameworks/table/mixins/table_delegate.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/table/system/table_column.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/table/views/table.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/table/views/table_cell.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/table/views/table_head.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/table/views/table_header.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/table/views/table_row.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/testing/core.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/testing/extras.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/testing/system/dump.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/testing/system/equiv.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/testing/system/plan.js +7 -1
- data/lib/frameworks/sproutcore/frameworks/testing/system/runner.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/testing/system/suite.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/testing/utils.js +1 -1
- data/lib/frameworks/sproutcore/license.js +2 -1
- data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/24px/button.css +10 -6
- data/lib/frameworks/sproutcore/themes/ace/resources/button/ace/button.css +5 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/button/dark/button.js +3 -1
- data/lib/frameworks/sproutcore/themes/ace/resources/button/popup/select.css +1 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/picker/popover/picker.js +1 -1
- data/lib/frameworks/sproutcore/themes/ace/resources/picker/popover/workspace.js +1 -1
- data/lib/frameworks/sproutcore/themes/ace/resources/radio/radio.css +0 -6
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/slider.css +2 -1
- data/lib/frameworks/sproutcore/themes/ace/resources/split/split.css +29 -3
- data/lib/frameworks/sproutcore/themes/ace/theme.js +17 -1
- data/lib/frameworks/sproutcore/themes/empty_theme/theme.js +1 -1
- data/lib/frameworks/sproutcore/themes/iphone_theme/english.lproj/strings.js +1 -1
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/Panel.drawit/Data +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/Panel.drawit/QuickLook/Preview.jpg +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/Panel.drawit/QuickLook/Thumbnail.jpg +0 -0
- data/lib/frameworks/sproutcore/themes/standard_theme/Source/SproutCore Theme Buttons.psd b/data/lib/frameworks/sproutcore/themes/legacy_theme/Source/SproutCore Theme → Buttons.psd +0 -0
- data/lib/frameworks/sproutcore/themes/standard_theme/Source/ToolbarView Pattern.drawit/Data b/data/lib/frameworks/sproutcore/themes/legacy_theme/Source/ToolbarView → Pattern.drawit/Data +0 -0
- data/lib/frameworks/sproutcore/themes/standard_theme/Source/ToolbarView Pattern.drawit/QuickLook/Preview.jpg b/data/lib/frameworks/sproutcore/themes/legacy_theme/Source/ToolbarView → Pattern.drawit/QuickLook/Preview.jpg +0 -0
- data/lib/frameworks/sproutcore/themes/standard_theme/Source/ToolbarView Pattern.drawit/QuickLook/Thumbnail.jpg b/data/lib/frameworks/sproutcore/themes/legacy_theme/Source/ToolbarView → Pattern.drawit/QuickLook/Thumbnail.jpg +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/10.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/100.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/102.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/110.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/120.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/127.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/18.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/19.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/2.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/24.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/26.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/27.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/28.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/29.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/30.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/31.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/33.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/37.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/41.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/16/99.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/10.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/100.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/102.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/110.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/120.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/127.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/18.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/19.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/2.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/24.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/26.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/27.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/28.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/29.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/30.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/31.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/33.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/37.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/41.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/24/99.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/10.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/100.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/102.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/110.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/120.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/127.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/18.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/19.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/2.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/24.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/26.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/27.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/28.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/29.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/30.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/31.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/33.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/37.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/41.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/32/99.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/48/10.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/48/18.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/48/19.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/icons/48/2.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/panel-sprite-x.drawit/Data +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/panel-sprite-x.drawit/QuickLook/Preview.jpg +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/panel-sprite-x.drawit/QuickLook/Thumbnail.jpg +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/panel-sprite-y.drawit/Data +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/panel-sprite-y.drawit/QuickLook/Preview.jpg +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/panel-sprite-y.drawit/QuickLook/Thumbnail.jpg +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/sc-theme-repeat-x-2.psd +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/sc-theme-repeat-x.psd +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/sc-theme-sprite.psd +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/sc-theme-ysprite.psd +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/shared-icons.psd +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/sproutcore-logo.psd +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/Source/sticky-note.psd +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/button.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/checkbox.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/collection.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/core.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/disclosure.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/icons/mini_222222.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/icons/mini_454545.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/icons/mini_888888.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/icons/mini_ffffff.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/panels/sprite-x.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/panels/sprite-y.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/sc-scroller-repeat-x.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/sc-scroller-repeat-y.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/sc-scroller-sprite.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/sc-theme-repeat-x.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/sc-theme-ysprite.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/images/sc-toolbar-view.png +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/label.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/list_item.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/menu.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/menu_item_view.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/pane.css +1 -1
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/panel.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/picker.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/progress.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/radio.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/scroller.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/segmented.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/slider.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/split_view.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/tab.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/table.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/text_field.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/toolbar.css +0 -0
- data/lib/frameworks/sproutcore/themes/{standard_theme → legacy_theme}/english.lproj/well.css +0 -0
- data/lib/frameworks/sproutcore/themes/legacy_theme/render_delegates/button.js +89 -0
- data/lib/frameworks/sproutcore/themes/legacy_theme/render_delegates/panel.js +28 -0
- data/lib/frameworks/sproutcore/themes/legacy_theme/render_delegates/progress.js +194 -0
- data/lib/frameworks/sproutcore/themes/legacy_theme/render_delegates/slider.js +67 -0
- data/lib/frameworks/sproutcore/themes/legacy_theme/render_delegates/well.js +27 -0
- data/lib/frameworks/sproutcore/themes/legacy_theme/theme.js +13 -0
- data/lib/sproutcore/builders.rb +0 -1
- data/lib/sproutcore/builders/base.rb +3 -1
- data/lib/sproutcore/builders/chance_file.rb +29 -10
- data/lib/sproutcore/builders/combine.rb +2 -4
- data/lib/sproutcore/builders/javascript.rb +14 -1
- data/lib/sproutcore/builders/minify.rb +3 -2
- data/lib/sproutcore/builders/module.rb +2 -0
- data/lib/sproutcore/helpers/minifier.rb +91 -37
- data/lib/sproutcore/helpers/static_helper.rb +26 -10
- data/lib/sproutcore/models/target.rb +36 -6
- data/lib/sproutcore/tools.rb +26 -20
- data/lib/sproutcore/tools/build.rb +2 -1
- data/spec/buildtasks/manifest/prepare_build_tasks/chance_2x_spec.rb +100 -0
- data/spec/buildtasks/manifest/prepare_build_tasks/chance_spec.rb +17 -13
- data/spec/buildtasks/manifest/prepare_build_tasks/combine_spec.rb +3 -3
- data/spec/buildtasks/manifest/prepare_build_tasks/packed_2x_indirect_spec.rb +191 -0
- data/spec/buildtasks/manifest/prepare_build_tasks/packed_2x_spec.rb +185 -0
- data/spec/buildtasks/manifest/prepare_build_tasks/packed_spec.rb +32 -30
- data/spec/fixtures/builder_tests/apps/chance_test/resources/force@2x.png +0 -0
- data/spec/fixtures/real_world/frameworks/no_2x/resources/test.css +1 -0
- data/spec/fixtures/real_world/frameworks/no_2x/resources/test.png +0 -0
- data/spec/fixtures/real_world/frameworks/sproutcore/resources/force@2x.png +0 -0
- data/spec/lib/builders/chance_file_spec.rb +11 -30
- data/sproutcore.gemspec +2 -2
- data/vendor/chance/bin/chance +20 -46
- data/vendor/chance/lib/chance.rb +20 -3
- data/vendor/chance/lib/chance/instance.rb +154 -76
- data/vendor/chance/lib/chance/instance/data_url.rb +85 -0
- data/vendor/chance/lib/chance/instance/javascript.rb +19 -0
- data/vendor/chance/lib/chance/instance/slicing.rb +181 -0
- data/vendor/chance/lib/chance/instance/spriting.rb +311 -0
- data/vendor/chance/lib/chance/parser.rb +24 -20
- data/vendor/chance/lib/tester/test.rb +108 -0
- data/vendor/chance/lib/tester/test_runner.rb +27 -0
- data/vendor/chance/tests/parser/basic/input/test.css +4 -0
- data/vendor/chance/tests/parser/basic/output/test.parsed.css +5 -0
- metadata +255 -195
- data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/views/template_view/core.js +0 -85
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/template/checkbox_support.js +0 -20
- data/lib/frameworks/sproutcore/frameworks/core_foundation/views/template/collection.js +0 -106
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/models/polymorphic_single_attribute.js +0 -183
- data/lib/frameworks/sproutcore/frameworks/experimental/frameworks/polymorphism/tests/models/polymorphic/single.js +0 -124
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/button/ui.js +0 -69
- data/lib/frameworks/sproutcore/themes/ace/resources/button/button.js +0 -75
- data/lib/frameworks/sproutcore/themes/ace/resources/panel/panel.js +0 -20
- data/lib/frameworks/sproutcore/themes/ace/resources/progress/progress.js +0 -78
- data/lib/frameworks/sproutcore/themes/ace/resources/slider/ace/slider.js +0 -56
- data/lib/frameworks/sproutcore/themes/ace/resources/well/well.js +0 -17
- data/lib/sproutcore/builders/chance.rb +0 -64
- data/spec/lib/builders/chance_spec.rb +0 -81
- data/vendor/chance/lib/chance/imager.rb +0 -13
- data/vendor/chance/lib/chance/imagers/data_url.rb +0 -117
- data/vendor/chance/lib/chance/importer.rb +0 -64
- data/vendor/chance/lib/chance/sass_extensions.rb +0 -24
- data/vendor/chance/lib/chance/slicing.rb +0 -166
@@ -0,0 +1,19 @@
|
|
1
|
+
module Chance
|
2
|
+
class Instance
|
3
|
+
module JavaScript
|
4
|
+
def javascript(opts)
|
5
|
+
# Currently, we only include the preload JavaScript
|
6
|
+
preload_javascript(opts)
|
7
|
+
end
|
8
|
+
|
9
|
+
# Generates the preload JavaScript
|
10
|
+
def preload_javascript(opts)
|
11
|
+
output = "if (typeof CHANCE_SLICES === 'undefined') var CHANCE_SLICES = [];"
|
12
|
+
output += "CHANCE_SLICES = CHANCE_SLICES.concat(["
|
13
|
+
output += @slices.map {|name, slice| "'" + slice[:css_name] + "'" }.join(",\n")
|
14
|
+
output += "]);"
|
15
|
+
end
|
16
|
+
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
@@ -0,0 +1,181 @@
|
|
1
|
+
require "chance/perf"
|
2
|
+
|
3
|
+
module Chance
|
4
|
+
class Instance
|
5
|
+
|
6
|
+
# The Slicing module handles taking a collection of slice definitions to
|
7
|
+
# produce sliced images. It uses ChunkyPNG to perform the slicing, and
|
8
|
+
# stores the sliced image in the slice definition.
|
9
|
+
module Slicing
|
10
|
+
# performs the slicing indicated by each slice definition, and puts the resulting
|
11
|
+
# image in the slice definition's :image property.
|
12
|
+
#
|
13
|
+
# if x2 is supplied, this will assume it is a second pass to locate any @2x images
|
14
|
+
# and use them to replace the originals.
|
15
|
+
def slice_images(opts)
|
16
|
+
slices = @slices
|
17
|
+
output = ""
|
18
|
+
|
19
|
+
slices.each do |name, slice|
|
20
|
+
# If we modify the canvas, we'll place the modified canvas here.
|
21
|
+
# Otherwise, consumers will use slice[:file] [:canvas] or [:contents]
|
22
|
+
# to get the original data as needed.
|
23
|
+
slice[:canvas] = nil
|
24
|
+
|
25
|
+
# In any case, if there is one, we need to get the original file and canvas;
|
26
|
+
# this process also tells us if the slice is 2x, etc.
|
27
|
+
canvas = canvas_for slice, opts
|
28
|
+
|
29
|
+
# Check if a canvas is required
|
30
|
+
must_slice = (slice[:left] != 0 or slice[:right] != 0 or slice[:top] != 0 or slice[:bottom] != 0)
|
31
|
+
if must_slice or slice[:x2]
|
32
|
+
if canvas.nil?
|
33
|
+
throw "Chance could not load file '#{slice[:path]}'." +
|
34
|
+
"If it is not a PNG, RMagick is required to slice or use @2x mode."
|
35
|
+
end
|
36
|
+
|
37
|
+
f = slice[:proportion]
|
38
|
+
|
39
|
+
# RMagick or ChunkyPNG? 'columns' is RMagick
|
40
|
+
if canvas.respond_to?('columns')
|
41
|
+
canvas_width = canvas.columns
|
42
|
+
canvas_height = canvas.rows
|
43
|
+
else
|
44
|
+
canvas_width = canvas.width
|
45
|
+
canvas_height = canvas.height
|
46
|
+
end
|
47
|
+
|
48
|
+
if must_slice
|
49
|
+
rect = nil
|
50
|
+
|
51
|
+
# The math that uses canvas_width and canvas_height needs to return numbers that,
|
52
|
+
# when multiplied by f, are valid. So, divide by f first.
|
53
|
+
rect = slice_rect(slice, canvas_width / f, canvas_height / f)
|
54
|
+
|
55
|
+
if not rect.nil?
|
56
|
+
slice[:canvas] = canvas.crop(rect[:left] * f, rect[:top] * f, rect[:width] * f, rect[:height] * f)
|
57
|
+
canvas_width = rect[:height] * f
|
58
|
+
canvas_height = rect[:width] * f
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
62
|
+
slice[:target_width] = canvas_width / f
|
63
|
+
slice[:target_height] = canvas_height / f
|
64
|
+
end
|
65
|
+
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
# Returns either a RMagick image or a ChunkyPNG canvas for a slice, as applicable.
|
70
|
+
# If not applicable, the :raw property on the passed slice will be set.
|
71
|
+
#
|
72
|
+
# Opts specify if x2, etc. is allowed.
|
73
|
+
def canvas_for(slice, opts)
|
74
|
+
file = file_for(slice, opts)
|
75
|
+
file[:canvas]
|
76
|
+
end
|
77
|
+
|
78
|
+
# Returns the file to use for the specified slice (might be either the
|
79
|
+
# normal one, or a @2x one)
|
80
|
+
#
|
81
|
+
# The slice's :file property will be set to the Chance file.
|
82
|
+
# If @2x, the :x2 flag on the slice is set to true.
|
83
|
+
# opts specify if x2, etc. is allowed.
|
84
|
+
def file_for(slice, opts)
|
85
|
+
path = slice[:path]
|
86
|
+
|
87
|
+
file = get_file(path)
|
88
|
+
slice[:x2] = false
|
89
|
+
slice[:proportion] = 1
|
90
|
+
|
91
|
+
# Check for x2 version if we are in x2 mode
|
92
|
+
if opts[:x2]
|
93
|
+
begin
|
94
|
+
path_2x = path[0..(-1 - File.extname(path).length)] + "@2x.png"
|
95
|
+
|
96
|
+
file = get_file(path_2x)
|
97
|
+
slice[:x2] = true
|
98
|
+
slice[:proportion] = 2
|
99
|
+
rescue
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
raise "File does not exist: " + slice[:path] unless file
|
104
|
+
|
105
|
+
slice[:file] = file
|
106
|
+
file
|
107
|
+
end
|
108
|
+
|
109
|
+
# Creates the final slice rectangle from the image width and height
|
110
|
+
# returns nil if no rectangle or if the slice is the full image
|
111
|
+
def slice_rect(slice, image_width, image_height)
|
112
|
+
left = slice[:left]
|
113
|
+
top = slice[:top]
|
114
|
+
bottom = slice[:bottom]
|
115
|
+
right = slice[:right]
|
116
|
+
width = slice[:width]
|
117
|
+
height = slice[:height]
|
118
|
+
|
119
|
+
rect = {}
|
120
|
+
|
121
|
+
if not left.nil?
|
122
|
+
rect[:left] = left
|
123
|
+
|
124
|
+
# in this case, it must be left+width or left+right, or left-to-end
|
125
|
+
if not right.nil?
|
126
|
+
rect[:width] = image_width - right - left
|
127
|
+
elsif not width.nil?
|
128
|
+
rect[:width] = width
|
129
|
+
else
|
130
|
+
# then this is left-to-end
|
131
|
+
rect[:width] = image_width - left
|
132
|
+
end
|
133
|
+
elsif not right.nil?
|
134
|
+
# in this case it must be right+width or right-to-end
|
135
|
+
if not width.nil?
|
136
|
+
rect[:left] = image_width - width - right
|
137
|
+
rect[:width] = width
|
138
|
+
else
|
139
|
+
rect[:left] = image_width - right
|
140
|
+
rect[:width] = right
|
141
|
+
end
|
142
|
+
else
|
143
|
+
rect[:left] = 0
|
144
|
+
rect[:width] = image_width
|
145
|
+
end
|
146
|
+
|
147
|
+
if not top.nil?
|
148
|
+
rect[:top] = top
|
149
|
+
|
150
|
+
# in this case, it must be top+height or top+bottom or top-to-bottom
|
151
|
+
if not bottom.nil?
|
152
|
+
rect[:height] = image_height - bottom - top
|
153
|
+
elsif not height.nil?
|
154
|
+
rect[:height] = height
|
155
|
+
else
|
156
|
+
rect[:height] = image_height - top
|
157
|
+
end
|
158
|
+
elsif not bottom.nil?
|
159
|
+
# in this case it must be bottom+height
|
160
|
+
if not height.nil?
|
161
|
+
rect[:top] = image_height - height - bottom
|
162
|
+
rect[:height] = height
|
163
|
+
else
|
164
|
+
rect[:top] = image_height - bottom
|
165
|
+
rect[:height] = bottom
|
166
|
+
end
|
167
|
+
else
|
168
|
+
rect[:top] = 0
|
169
|
+
rect[:height] = image_height
|
170
|
+
end
|
171
|
+
|
172
|
+
if rect[:left] == 0 and rect[:top] == 0 and rect[:width] == image_width and rect[:height] == image_height
|
173
|
+
return nil
|
174
|
+
end
|
175
|
+
|
176
|
+
return rect
|
177
|
+
end
|
178
|
+
|
179
|
+
end
|
180
|
+
end
|
181
|
+
end
|
@@ -0,0 +1,311 @@
|
|
1
|
+
# Spriting support.
|
2
|
+
#
|
3
|
+
# The sprite method performs the spriting. It creates collections of
|
4
|
+
# images to sprite and then calls layout_sprite and generate_sprite.
|
5
|
+
#
|
6
|
+
# The layout_sprite method arranges the slices, defining their positions
|
7
|
+
# within the sprites.
|
8
|
+
#
|
9
|
+
# The generate_sprite method combines the slices into an image.
|
10
|
+
module Chance
|
11
|
+
|
12
|
+
class Instance
|
13
|
+
|
14
|
+
# The Spriting module handles sorting slices into sprites, laying them
|
15
|
+
# out within the sprites, and generating the final sprite images.
|
16
|
+
module Spriting
|
17
|
+
# Performs the spriting process on all of the @slices, creating sprite
|
18
|
+
# images in the class's @sprites property and updating the individual slices
|
19
|
+
# with a :sprite property containing the identifier of the sprite, and offset
|
20
|
+
# properties for the offsets within the image.
|
21
|
+
def generate_sprite_definitions(opts)
|
22
|
+
@sprites = {}
|
23
|
+
|
24
|
+
group_slices_into_sprites(opts)
|
25
|
+
@sprites.each do |key, sprite|
|
26
|
+
layout_slices_in_sprite sprite
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
# Determines the appropriate sprite for each slice, creating it if necessary,
|
31
|
+
# and puts the slice into that sprite. The appropriate sprite may differ based
|
32
|
+
# on the slice's repeat settings, for instance.
|
33
|
+
def group_slices_into_sprites(opts)
|
34
|
+
@slices.each do |key, slice|
|
35
|
+
sprite = sprite_for_slice(slice, opts)
|
36
|
+
sprite[:slices] << slice
|
37
|
+
|
38
|
+
@sprites[sprite[:name]] = sprite
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
# Returns the sprite to use for the given slice, creating the sprite if needed.
|
43
|
+
# The sprite could differ based on repeat settings or file type, for instance.
|
44
|
+
def sprite_for_slice(slice, opts)
|
45
|
+
sprite_name = sprite_name_for_slice(slice, opts)
|
46
|
+
|
47
|
+
get_sprite_named(sprite_name, opts.merge({
|
48
|
+
:horizontal_layout => slice[:repeat] == "repeat-y" ? true : false
|
49
|
+
}))
|
50
|
+
|
51
|
+
return @sprites[sprite_name]
|
52
|
+
end
|
53
|
+
|
54
|
+
# Creates a sprite definition with a given name and set of options
|
55
|
+
def get_sprite_named(sprite_name, opts)
|
56
|
+
if @sprites[sprite_name].nil?
|
57
|
+
@sprites[sprite_name] = {
|
58
|
+
:name => sprite_name,
|
59
|
+
:slices => [],
|
60
|
+
:has_generated => false,
|
61
|
+
|
62
|
+
# The sprite will use horizontal layout under repeat-y, where images
|
63
|
+
# must stretch all the way from the top to the bottom
|
64
|
+
:use_horizontal_layout => opts[:horizontal_layout]
|
65
|
+
|
66
|
+
}
|
67
|
+
end
|
68
|
+
end
|
69
|
+
|
70
|
+
# Determines the name of the sprite for the given slice. The sprite
|
71
|
+
# by this name may not exist yet.
|
72
|
+
def sprite_name_for_slice(slice, opts)
|
73
|
+
if slice[:repeat] == "repeat-both"
|
74
|
+
return slice[:path] + (opts[:x2] ? "@2x" : "")
|
75
|
+
end
|
76
|
+
|
77
|
+
return slice[:repeat] + (opts[:x2] ? "@2x" : "") + File.extname(slice[:path])
|
78
|
+
end
|
79
|
+
|
80
|
+
# Performs the layout operation, laying either up-to-down, or "
|
81
|
+
# (for repeat-y slices) left-to-right.
|
82
|
+
def layout_slices_in_sprite(sprite)
|
83
|
+
# The position is the position in the layout direction. In vertical mode
|
84
|
+
# (the usual) it is the Y position.
|
85
|
+
pos = 0
|
86
|
+
|
87
|
+
# The size is the current size of the sprite in the non-layout direction;
|
88
|
+
# for example, in the usual, vertical mode, the size is the width.
|
89
|
+
#
|
90
|
+
# Usually, this is computed as a simple max of itself and the width of any
|
91
|
+
# given slice. However, when repeating, the least common multiple is used,
|
92
|
+
# and the smallest item is stored as well.
|
93
|
+
size = 1
|
94
|
+
smallest_size = nil
|
95
|
+
|
96
|
+
is_horizontal = sprite[:use_horizontal_layout]
|
97
|
+
|
98
|
+
sprite[:slices].each do |slice|
|
99
|
+
# We must find a canvas either on the slice (if it was actually sliced),
|
100
|
+
# or on the slice's file. Otherwise, we're in big shit.
|
101
|
+
canvas = slice[:canvas] || slice[:file][:canvas]
|
102
|
+
|
103
|
+
# TODO: MAKE A BETTER ERROR.
|
104
|
+
unless canvas
|
105
|
+
throw "Could not sprite image " + slice[:path] + "; if it is not a PNG"
|
106
|
+
end
|
107
|
+
|
108
|
+
# RMagick has a different API than ChunkyPNG; we have to detect
|
109
|
+
# which one we are using, and use the correct API accordingly.
|
110
|
+
if canvas.respond_to?('columns')
|
111
|
+
slice_width = canvas.columns
|
112
|
+
slice_height = canvas.rows
|
113
|
+
else
|
114
|
+
slice_width = canvas.width
|
115
|
+
slice_height = canvas.height
|
116
|
+
end
|
117
|
+
|
118
|
+
slice_length = is_horizontal ? slice_width : slice_height
|
119
|
+
slice_size = is_horizontal ? slice_height : slice_width
|
120
|
+
|
121
|
+
# When repeating, we must use the least common multiple so that
|
122
|
+
# we can ensure the repeat pattern works even with multiple repeat
|
123
|
+
# sizes. However, we should take into account how much extra we are
|
124
|
+
# adding by tracking the smallest size item as well.
|
125
|
+
if slice[:repeat] != "no-repeat"
|
126
|
+
smallest_size = slice_size if smallest_size.nil?
|
127
|
+
smallest_size = [slice_size, smallest_size].min
|
128
|
+
|
129
|
+
size = size.lcm slice_size
|
130
|
+
else
|
131
|
+
size = [size, slice_size].max
|
132
|
+
end
|
133
|
+
|
134
|
+
# We have extras for manual tweaking of offsetx/y. We have to make sure there
|
135
|
+
# is padding for this (on either side)
|
136
|
+
#
|
137
|
+
# We have to add room for the minimum offset by adding to the end, and add
|
138
|
+
# room for the max by adding to the front. We only care about it in our
|
139
|
+
# layout direction. Otherwise, the slices are flush to the edge, so it won't
|
140
|
+
# matter.
|
141
|
+
if slice[:min_offset_x] < 0 and is_horizontal
|
142
|
+
slice_length -= slice[:min_offset_x]
|
143
|
+
elsif slice[:min_offset_y] < 0 and not is_horizontal
|
144
|
+
slice_length -= slice[:min_offset_y]
|
145
|
+
end
|
146
|
+
|
147
|
+
if slice[:max_offset_x] > 0 and is_horizontal
|
148
|
+
pos += slice[:max_offset_x]
|
149
|
+
elsif slice[:max_offset_y] > 0 and not is_horizontal
|
150
|
+
pos += slice[:max_offset_y]
|
151
|
+
end
|
152
|
+
|
153
|
+
|
154
|
+
slice[:sprite_slice_x] = is_horizontal ? pos : 0
|
155
|
+
slice[:sprite_slice_y] = is_horizontal ? 0 : pos
|
156
|
+
slice[:sprite_slice_width] = slice_width
|
157
|
+
slice[:sprite_slice_height] = slice_height
|
158
|
+
|
159
|
+
pos += slice_length
|
160
|
+
end
|
161
|
+
|
162
|
+
# TODO: USE A CONSTANT FOR THIS WARNING
|
163
|
+
smallest_size = size if smallest_size == nil
|
164
|
+
if size - smallest_size > 10
|
165
|
+
puts "WARNING: Used more than 10 extra rows or columns to accomdate repeating slices."
|
166
|
+
puts "Wasted up to " + (pos * size-smallest_size).to_s + " pixels"
|
167
|
+
end
|
168
|
+
|
169
|
+
sprite[:width] = is_horizontal ? pos : size
|
170
|
+
sprite[:height] = is_horizontal ? size : pos
|
171
|
+
|
172
|
+
end
|
173
|
+
|
174
|
+
|
175
|
+
# Generates the image for the specified sprite, putting it in the sprite's
|
176
|
+
# :image property.
|
177
|
+
def generate_sprite(sprite)
|
178
|
+
canvas = canvas_for_sprite(sprite)
|
179
|
+
sprite[:canvas] = canvas
|
180
|
+
|
181
|
+
sprite[:slices].each do |slice|
|
182
|
+
x = slice[:sprite_slice_x]
|
183
|
+
y = slice[:sprite_slice_y]
|
184
|
+
width = slice[:sprite_slice_width]
|
185
|
+
height = slice[:sprite_slice_height]
|
186
|
+
|
187
|
+
# If it repeats, it needs to go edge-to-edge in one direction
|
188
|
+
if slice[:repeat] == 'repeat-y'
|
189
|
+
height = sprite[:height]
|
190
|
+
end
|
191
|
+
|
192
|
+
if slice[:repeat] == 'repeat-x'
|
193
|
+
width = sprite[:width]
|
194
|
+
end
|
195
|
+
|
196
|
+
compose_slice_on_canvas(canvas, slice, x, y, width, height)
|
197
|
+
end
|
198
|
+
end
|
199
|
+
|
200
|
+
def canvas_for_sprite(sprite)
|
201
|
+
width = sprite[:width]
|
202
|
+
height = sprite[:height]
|
203
|
+
|
204
|
+
# If we require RMagick, we should have already loaded it, so we don't
|
205
|
+
# need to worry over that at the moment.
|
206
|
+
if sprite[:name] =~ /\.(gif|jpg)/
|
207
|
+
return Magick::Image.new(width, height)
|
208
|
+
else
|
209
|
+
return ChunkyPNG::Image.new(width, height, ChunkyPNG::Color::TRANSPARENT)
|
210
|
+
end
|
211
|
+
end
|
212
|
+
|
213
|
+
# Writes a slice to the target canvas, repeating it as necessary to fill the width/height.
|
214
|
+
def compose_slice_on_canvas(target, slice, x, y, width, height)
|
215
|
+
source_canvas = slice[:canvas] || slice[:file][:canvas]
|
216
|
+
source_width = slice[:sprite_slice_width]
|
217
|
+
source_height = slice[:sprite_slice_height]
|
218
|
+
|
219
|
+
top = 0
|
220
|
+
left = 0
|
221
|
+
|
222
|
+
# Repeat the pattern to fill the width/height.
|
223
|
+
while top < height do
|
224
|
+
while left < width do
|
225
|
+
if target.respond_to?(:compose)
|
226
|
+
target.compose!(source_canvas, left + x, top + y)
|
227
|
+
else
|
228
|
+
target.composite!(source_canvas, left + x, top + y)
|
229
|
+
end
|
230
|
+
left += source_width
|
231
|
+
end
|
232
|
+
top += source_height
|
233
|
+
end
|
234
|
+
|
235
|
+
end
|
236
|
+
|
237
|
+
# Postprocesses the CSS, inserting sprites and defining offsets.
|
238
|
+
def postprocess_css_sprited(opts)
|
239
|
+
# The images should already be sliced appropriately, as we are
|
240
|
+
# called by the css method, which calls slice_images.
|
241
|
+
|
242
|
+
# We will need the position of all sprites, so generate the sprite
|
243
|
+
# definitions now:
|
244
|
+
generate_sprite_definitions(opts)
|
245
|
+
|
246
|
+
css = @css.gsub(/_sc_chance:\s*["'](.*?)["']/) {|match|
|
247
|
+
slice = @slices[$1]
|
248
|
+
sprite = sprite_for_slice(slice, opts)
|
249
|
+
|
250
|
+
output = "background-image: chance_file('#{sprite[:name]}')\n"
|
251
|
+
|
252
|
+
if slice[:x2]
|
253
|
+
width = sprite[:width] / slice[:proportion]
|
254
|
+
height = sprite[:height] / slice[:proportion]
|
255
|
+
output += "; -webkit-background-size: #{width}px #{height}px"
|
256
|
+
end
|
257
|
+
|
258
|
+
output
|
259
|
+
}
|
260
|
+
|
261
|
+
css.gsub!(/-chance-offset:\s?"(.*?)" (-?[0-9]+) (-?[0-9]+)/) {|match|
|
262
|
+
slice = @slices[$1]
|
263
|
+
|
264
|
+
slice_x = $2.to_i - slice[:sprite_slice_x]
|
265
|
+
slice_y = $3.to_i - slice[:sprite_slice_y]
|
266
|
+
|
267
|
+
# If it is 2x, we are scaling the slice down by 2, making all of our
|
268
|
+
# positions need to be 1/2 of what they were.
|
269
|
+
if slice[:x2]
|
270
|
+
slice_x /= slice[:proportion]
|
271
|
+
slice_y /= slice[:proportion]
|
272
|
+
end
|
273
|
+
|
274
|
+
"background-position: #{slice_x}px #{slice_y}px"
|
275
|
+
}
|
276
|
+
|
277
|
+
css
|
278
|
+
|
279
|
+
end
|
280
|
+
|
281
|
+
def sprite_data(opts)
|
282
|
+
_render
|
283
|
+
slice_images(opts)
|
284
|
+
generate_sprite_definitions(opts)
|
285
|
+
|
286
|
+
sprite = @sprites[opts[:name]]
|
287
|
+
|
288
|
+
# When the sprite is nil, it simply means there weren't any images,
|
289
|
+
# so this sprite is not needed. But build systems may still
|
290
|
+
# expect this file to exist. We'll just make it empty.
|
291
|
+
if sprite.nil?
|
292
|
+
return ""
|
293
|
+
end
|
294
|
+
|
295
|
+
|
296
|
+
generate_sprite(sprite) if not sprite[:has_generated]
|
297
|
+
|
298
|
+
sprite[:canvas].to_blob
|
299
|
+
end
|
300
|
+
|
301
|
+
def sprite_names(opts={})
|
302
|
+
_render
|
303
|
+
slice_images(opts)
|
304
|
+
generate_sprite_definitions(opts)
|
305
|
+
|
306
|
+
@sprites.keys
|
307
|
+
end
|
308
|
+
|
309
|
+
end
|
310
|
+
end
|
311
|
+
end
|