sproutcore 1.0.1049.pre.2 → 1.4.0.rc
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -1
- data/VERSION.yml +4 -4
- data/lib/Buildfile +1 -1
- data/lib/frameworks/sproutcore/Buildfile +13 -27
- data/lib/frameworks/sproutcore/apps/greenhouse/controllers/library.js +0 -42
- data/lib/frameworks/sproutcore/apps/greenhouse/controllers/view_configs.js +100 -0
- data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/app_page.js +1 -1
- data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/dialogs.js +33 -9
- data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/strings.js +5 -2
- data/lib/frameworks/sproutcore/apps/greenhouse/states/main.js +1 -0
- data/lib/frameworks/sproutcore/apps/greenhouse/states/modals.js +21 -11
- data/lib/frameworks/sproutcore/apps/welcome/controllers/targets.js +0 -7
- data/lib/frameworks/sproutcore/apps/welcome/english.lproj/main_page.css +6 -24
- data/lib/frameworks/sproutcore/apps/welcome/english.lproj/main_page.js +46 -36
- data/lib/frameworks/sproutcore/frameworks/animation/core.js +32 -50
- data/lib/frameworks/sproutcore/frameworks/animation/tests/core.js +2 -7
- data/lib/frameworks/sproutcore/frameworks/bootstrap/system/browser.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/datastore/models/record.js +66 -42
- data/lib/frameworks/sproutcore/frameworks/datastore/models/record_attribute.js +4 -12
- data/lib/frameworks/sproutcore/frameworks/datastore/models/single_attribute.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/{desktop/tests → datastore/tests/models}/datetime_recordattribute.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/english.lproj/list_item.css +3 -27
- data/lib/frameworks/sproutcore/frameworks/desktop/english.lproj/touch-scroller.css +196 -0
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/collection_fast_path.js +21 -8
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/alert.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/menu.js +15 -19
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/panel.js +22 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/picker.js +54 -12
- data/lib/frameworks/sproutcore/frameworks/desktop/panes/select_button.js +45 -18
- data/lib/frameworks/sproutcore/frameworks/desktop/system/drag.js +52 -32
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/methods.js +3 -28
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/ui.js +10 -30
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/checkbox/methods.js +17 -11
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/date_field/ui.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_simple.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list_item.js +20 -128
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/progress/ui.js +39 -8
- data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/methods.js +47 -23
- data/lib/frameworks/sproutcore/frameworks/desktop/views/button.js +90 -59
- data/lib/frameworks/sproutcore/frameworks/desktop/views/checkbox.js +39 -29
- data/lib/frameworks/sproutcore/frameworks/desktop/views/collection.js +15 -11
- data/lib/frameworks/sproutcore/frameworks/desktop/views/disclosure.js +16 -17
- data/lib/frameworks/sproutcore/frameworks/desktop/views/list_item.js +278 -457
- data/lib/frameworks/sproutcore/frameworks/desktop/views/menu_item.js +5 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/views/popup_button.js +101 -5
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scroll.js +87 -85
- data/lib/frameworks/sproutcore/frameworks/desktop/views/scroller.js +278 -33
- data/lib/frameworks/sproutcore/frameworks/desktop/views/segmented.js +146 -60
- data/lib/frameworks/sproutcore/frameworks/desktop/views/select.js +80 -211
- data/lib/frameworks/sproutcore/frameworks/desktop/views/select_field.js +10 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/slider.js +34 -33
- data/lib/frameworks/sproutcore/frameworks/desktop/views/split.js +248 -331
- data/lib/frameworks/sproutcore/frameworks/desktop/views/static_content.js +12 -1
- data/lib/frameworks/sproutcore/frameworks/desktop/views/web.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/controllers/object.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/core.js +2 -33
- data/lib/frameworks/sproutcore/frameworks/foundation/ext/run_loop.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/license.js +11 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/button.js +6 -12
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/content_display.js +9 -4
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/control.js +1 -83
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/inline_text_field.js +7 -6
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/selection_support.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/panes/main.js +2 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/panes/pane.js +107 -143
- data/lib/frameworks/sproutcore/frameworks/foundation/system/bundle.js +8 -4
- data/lib/frameworks/sproutcore/frameworks/foundation/system/core_query.js +4 -3
- data/lib/frameworks/sproutcore/frameworks/foundation/system/event.js +44 -33
- data/lib/frameworks/sproutcore/frameworks/foundation/system/exception_handler.js +85 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/system/image_cache.js +9 -9
- data/lib/frameworks/sproutcore/frameworks/foundation/system/platform.js +114 -6
- data/lib/frameworks/sproutcore/frameworks/foundation/system/ready.js +37 -38
- data/lib/frameworks/sproutcore/frameworks/foundation/system/render_context.js +5 -33
- data/lib/frameworks/sproutcore/frameworks/foundation/system/response.js +17 -19
- data/lib/frameworks/sproutcore/frameworks/foundation/system/root_responder.js +311 -255
- data/lib/frameworks/sproutcore/frameworks/foundation/system/routes.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/foundation/system/task_queue.js +10 -10
- data/lib/frameworks/sproutcore/frameworks/foundation/system/utils.js +53 -44
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/button/keyEquivalents.js +17 -16
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/staticLayout.js +0 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/end.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/helpers_style.js +3 -11
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/update.js +4 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/timer/invokeLater.js +5 -7
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/pane/sendEvent.js +41 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/text_field/ui.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/clippingFrame.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/createLayer.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/layoutStyle.js +56 -118
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/prepareContext.js +4 -12
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/render.js +5 -48
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/updateLayer.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/updateLayerLocation.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/viewDidResize.js +2 -24
- data/lib/frameworks/sproutcore/frameworks/foundation/validators/date_time.js +2 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/views/field.js +3 -3
- data/lib/frameworks/sproutcore/frameworks/foundation/views/label.js +49 -21
- data/lib/frameworks/sproutcore/frameworks/foundation/views/text_field.js +85 -54
- data/lib/frameworks/sproutcore/frameworks/foundation/views/view.js +256 -1174
- data/lib/frameworks/sproutcore/frameworks/media/views/audio.js +81 -74
- data/lib/frameworks/sproutcore/frameworks/media/views/controls.js +2 -2
- data/lib/frameworks/sproutcore/frameworks/media/views/miniControls.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/mobile/tests/views/button/ui.js +1 -8
- data/lib/frameworks/sproutcore/frameworks/mobile/views/button.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/core.js +54 -25
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/array.js +1 -11
- data/lib/frameworks/sproutcore/frameworks/runtime/mixins/observable.js +8 -5
- data/lib/frameworks/sproutcore/frameworks/runtime/private/observer_queue.js +1 -1
- data/lib/frameworks/sproutcore/frameworks/runtime/private/observer_set.js +24 -25
- data/lib/frameworks/sproutcore/frameworks/runtime/system/binding.js +9 -6
- data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js +13 -6
- data/lib/frameworks/sproutcore/frameworks/runtime/system/run_loop.js +26 -11
- data/lib/frameworks/sproutcore/frameworks/runtime/system/set.js +140 -33
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/core/guidFor.js +33 -0
- data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/object/base.js +48 -1
- data/lib/frameworks/sproutcore/frameworks/statechart/mixins/statechart.js +2 -3
- data/lib/frameworks/sproutcore/frameworks/testing/system/runner.js +1 -1
- data/lib/frameworks/sproutcore/themes/standard_theme/english.lproj/scroller.css +8 -4
- data/lib/sproutcore/helpers/entry_sorter.rb +14 -1
- data/sproutcore.gemspec +0 -2
- metadata +12 -443
- data/lib/frameworks/sproutcore/Gemfile +0 -8
- data/lib/frameworks/sproutcore/Gemfile.lock +0 -33
- data/lib/frameworks/sproutcore/apps/test_controls/Buildfile +0 -0
- data/lib/frameworks/sproutcore/apps/test_controls/controllers/categories.js +0 -108
- data/lib/frameworks/sproutcore/apps/test_controls/controllers/category.js +0 -31
- data/lib/frameworks/sproutcore/apps/test_controls/core.js +0 -29
- data/lib/frameworks/sproutcore/apps/test_controls/main.js +0 -14
- data/lib/frameworks/sproutcore/apps/test_controls/resources/buttons_page.js +0 -124
- data/lib/frameworks/sproutcore/apps/test_controls/resources/checkboxes_page.js +0 -45
- data/lib/frameworks/sproutcore/apps/test_controls/resources/flow_layout_page.js +0 -77
- data/lib/frameworks/sproutcore/apps/test_controls/resources/list_page.js +0 -40
- data/lib/frameworks/sproutcore/apps/test_controls/resources/loading.rhtml +0 -9
- data/lib/frameworks/sproutcore/apps/test_controls/resources/main_page.css +0 -54
- data/lib/frameworks/sproutcore/apps/test_controls/resources/main_page.js +0 -136
- data/lib/frameworks/sproutcore/apps/test_controls/resources/progress_page.js +0 -42
- data/lib/frameworks/sproutcore/apps/test_controls/resources/radio_page.js +0 -41
- data/lib/frameworks/sproutcore/apps/test_controls/resources/scroll_page.js +0 -76
- data/lib/frameworks/sproutcore/apps/test_controls/resources/segmented_page.js +0 -75
- data/lib/frameworks/sproutcore/apps/test_controls/resources/select_page.js +0 -60
- data/lib/frameworks/sproutcore/apps/test_controls/resources/sliders_page.js +0 -53
- data/lib/frameworks/sproutcore/apps/test_controls/resources/strings.js +0 -50
- data/lib/frameworks/sproutcore/apps/test_controls/resources/tab_page.js +0 -15
- data/lib/frameworks/sproutcore/apps/test_controls/resources/text_field_page.js +0 -40
- data/lib/frameworks/sproutcore/apps/welcome/english.lproj/images/main-bg.png +0 -0
- data/lib/frameworks/sproutcore/bin/edit_json.rb +0 -14
- data/lib/frameworks/sproutcore/bin/erubis +0 -14
- data/lib/frameworks/sproutcore/bin/prettify_json.rb +0 -14
- data/lib/frameworks/sproutcore/bin/rackup +0 -14
- data/lib/frameworks/sproutcore/bin/rake2thor +0 -14
- data/lib/frameworks/sproutcore/bin/sc-build +0 -14
- data/lib/frameworks/sproutcore/bin/sc-build-number +0 -14
- data/lib/frameworks/sproutcore/bin/sc-docs +0 -14
- data/lib/frameworks/sproutcore/bin/sc-gen +0 -14
- data/lib/frameworks/sproutcore/bin/sc-init +0 -14
- data/lib/frameworks/sproutcore/bin/sc-manifest +0 -14
- data/lib/frameworks/sproutcore/bin/sc-server +0 -14
- data/lib/frameworks/sproutcore/bin/sproutcore +0 -14
- data/lib/frameworks/sproutcore/bin/thin +0 -14
- data/lib/frameworks/sproutcore/bin/thor +0 -14
- data/lib/frameworks/sproutcore/frameworks/desktop/mixins/navigation_builder.js +0 -130
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/button.js +0 -147
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/checkbox.js +0 -87
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/checkbox_control.js +0 -103
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/disclosure.js +0 -82
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/disclosure_control.js +0 -103
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/image_button.js +0 -33
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/list_item.js +0 -334
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/masterDetail.js +0 -23
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/panel.js +0 -34
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/picker.js +0 -50
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/segment.js +0 -79
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/segmented.js +0 -172
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/slider.js +0 -86
- data/lib/frameworks/sproutcore/frameworks/desktop/renderers/workspace.js +0 -22
- data/lib/frameworks/sproutcore/frameworks/desktop/views/file.js +0 -112
- data/lib/frameworks/sproutcore/frameworks/desktop/views/master_detail.js +0 -249
- data/lib/frameworks/sproutcore/frameworks/desktop/views/navigation.js +0 -237
- data/lib/frameworks/sproutcore/frameworks/desktop/views/navigation_bar.js +0 -181
- data/lib/frameworks/sproutcore/frameworks/desktop/views/workspace.js +0 -270
- data/lib/frameworks/sproutcore/frameworks/documentation/core.js +0 -0
- data/lib/frameworks/sproutcore/frameworks/forms/english.lproj/default_styles.css +0 -5
- data/lib/frameworks/sproutcore/frameworks/forms/english.lproj/strings.js +0 -15
- data/lib/frameworks/sproutcore/frameworks/forms/mixins/auto_hide.js +0 -85
- data/lib/frameworks/sproutcore/frameworks/forms/mixins/edit_mode.js +0 -43
- data/lib/frameworks/sproutcore/frameworks/forms/renderers/form.js +0 -24
- data/lib/frameworks/sproutcore/frameworks/forms/renderers/form_row.js +0 -24
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form.js +0 -15
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_checkbox_field.js +0 -15
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_field.js +0 -15
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_label.js +0 -15
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_radio_field.js +0 -15
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_row.js +0 -15
- data/lib/frameworks/sproutcore/frameworks/forms/tests/views/form_text_field.js +0 -15
- data/lib/frameworks/sproutcore/frameworks/forms/views/form.js +0 -266
- data/lib/frameworks/sproutcore/frameworks/forms/views/form_row.js +0 -188
- data/lib/frameworks/sproutcore/frameworks/foundation/english.lproj/images/sproutcore.png +0 -0
- data/lib/frameworks/sproutcore/frameworks/foundation/gestures/pinch.js +0 -81
- data/lib/frameworks/sproutcore/frameworks/foundation/gestures/swipe.js +0 -142
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_mixin.js +0 -33
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/auto_resize.js +0 -74
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/flowed_layout.js +0 -415
- data/lib/frameworks/sproutcore/frameworks/foundation/mixins/gestureable.js +0 -106
- data/lib/frameworks/sproutcore/frameworks/foundation/renderers/control.js +0 -122
- data/lib/frameworks/sproutcore/frameworks/foundation/renderers/image.js +0 -51
- data/lib/frameworks/sproutcore/frameworks/foundation/renderers/label.js +0 -96
- data/lib/frameworks/sproutcore/frameworks/foundation/renderers/renderer.js +0 -316
- data/lib/frameworks/sproutcore/frameworks/foundation/renderers/title.js +0 -108
- data/lib/frameworks/sproutcore/frameworks/foundation/renderers/view.js +0 -62
- data/lib/frameworks/sproutcore/frameworks/foundation/system/gesture.js +0 -245
- data/lib/frameworks/sproutcore/frameworks/foundation/system/theme.js +0 -108
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/renderers/renderer/base.js +0 -170
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/renderers/renderer/inheritance.js +0 -39
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/theme.js +0 -86
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/pane/sendTouchEvent.js +0 -267
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/animation.js +0 -321
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/build.js +0 -85
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/build_children.js +0 -89
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/renderer.js +0 -443
- data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/view/theme.js +0 -41
- data/lib/frameworks/sproutcore/frameworks/jquery/jquery.js +0 -6240
- data/lib/frameworks/sproutcore/frameworks/test +0 -77
- data/lib/frameworks/sproutcore/themes/ace/Buildfile +0 -0
- data/lib/frameworks/sproutcore/themes/ace/README.md +0 -161
- data/lib/frameworks/sproutcore/themes/ace/build +0 -2
- data/lib/frameworks/sproutcore/themes/ace/build-d +0 -2
- data/lib/frameworks/sproutcore/themes/ace/chance/README.md +0 -113
- data/lib/frameworks/sproutcore/themes/ace/chance/chance.rb +0 -203
- data/lib/frameworks/sproutcore/themes/ace/chance/lib/css.rb +0 -202
- data/lib/frameworks/sproutcore/themes/ace/chance/lib/slicedice.rb +0 -391
- data/lib/frameworks/sproutcore/themes/ace/chance/sc-theme.rb +0 -0
- data/lib/frameworks/sproutcore/themes/ace/chance/scripts/setup.rb +0 -126
- data/lib/frameworks/sproutcore/themes/ace/mockups/dark.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/mockups/dark.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/mockups/light.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/mockups/light.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/images/1.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/images/2.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/images/3.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/resources/theme.css +0 -1832
- data/lib/frameworks/sproutcore/themes/ace/scroll_test/resources/images/1.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/scroll_test/resources/images/2.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/scroll_test/resources/images/3.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/scroll_test/resources/theme.css +0 -147
- data/lib/frameworks/sproutcore/themes/ace/scroll_test/scrollbars.html +0 -326
- data/lib/frameworks/sproutcore/themes/ace/src/body.css +0 -13
- data/lib/frameworks/sproutcore/themes/ace/src/collections/list.css +0 -4
- data/lib/frameworks/sproutcore/themes/ace/src/collections/list_item.css +0 -7
- data/lib/frameworks/sproutcore/themes/ace/src/collections/source_list/selection.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/collections/source_list/selection.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/collections/source_list/source_list_view.css +0 -37
- data/lib/frameworks/sproutcore/themes/ace/src/containers/container.css +0 -3
- data/lib/frameworks/sproutcore/themes/ace/src/containers/masterdetail/master-detail.css +0 -26
- data/lib/frameworks/sproutcore/themes/ace/src/containers/split/split.css +0 -4
- data/lib/frameworks/sproutcore/themes/ace/src/containers/tab/tab.css +0 -9
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button.js +0 -23
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/18px/active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/18px/active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/18px/button_view.css +0 -53
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/18px/normal_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/18px/normal_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/18px/selected_active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/18px/selected_active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/18px/selected_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/18px/selected_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/active_button_capsule.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/active_button_capsule.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/active_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/active_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/button_view.css +0 -144
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/normal_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/normal_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/normal_button_capsule.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/normal_button_capsule.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/normal_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/normal_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_active_button_capsule.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_active_button_capsule.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_active_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_active_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_button_capsule.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_button_capsule.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/24px/selected_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/active_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/active_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/button_view_30.css +0 -111
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/normal_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/normal_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/normal_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/normal_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/selected_active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/selected_active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/selected_active_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/selected_active_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/selected_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/selected_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/selected_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/30px/selected_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/44px/active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/44px/active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/44px/button_view.css +0 -57
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/44px/normal_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/44px/normal_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/44px/selected_active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/44px/selected_active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/44px/selected_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/44px/selected_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/button_view/button_view.css +0 -56
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/disclosure_view/disclosure_closed.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/disclosure_view/disclosure_closed.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/disclosure_view/disclosure_closed_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/disclosure_view/disclosure_closed_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/disclosure_view/disclosure_open.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/disclosure_view/disclosure_open.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/disclosure_view/disclosure_open_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/disclosure_view/disclosure_open_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/buttons/disclosure_view/disclosure_view.css +0 -64
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox.css +0 -25
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_checked.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_checked.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_checked_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_checked_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_mixed.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_mixed.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_mixed_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_mixed_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_unchecked.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_unchecked.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_unchecked_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/14px/checkbox_unchecked_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox.css +0 -25
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_checked.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_checked.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_checked_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_checked_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_mixed.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_mixed.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_mixed_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_mixed_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_unchecked.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_unchecked.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_unchecked_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/16px/checkbox_unchecked_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/checkbox.css +0 -4
- data/lib/frameworks/sproutcore/themes/ace/src/controls/checkboxes/checkbox_control.css +0 -31
- data/lib/frameworks/sproutcore/themes/ace/src/controls/progress/progress_view/progress_view.css +0 -70
- data/lib/frameworks/sproutcore/themes/ace/src/controls/progress/progress_view/progress_view_content.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/progress/progress_view/progress_view_content.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/progress/progress_view/progress_view_indeterminate_content.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/progress/progress_view/progress_view_track.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/progress/progress_view/progress_view_track.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio.css +0 -61
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_mixed.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_mixed.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_mixed_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_mixed_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_selected.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_selected.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_selected_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_selected_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_unselected.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/radio/radio_unselected.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/horizontal/horizontal.css +0 -77
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/horizontal/thumb.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/horizontal/thumb.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/horizontal/track_and_arrows.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/horizontal/track_and_arrows.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/horizontal/track_and_arrows_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/horizontal/track_and_arrows_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/vertical.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/vertical/thumb.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/vertical/thumb.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/vertical/track_and_arrows.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/vertical/track_and_arrows.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/vertical/track_and_arrows_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/vertical/track_and_arrows_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/scroll/vertical/vertical.css +0 -74
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/18px/segmented.css +0 -92
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/18px/segmented_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/18px/segmented_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/18px/segmented_normal.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/18px/segmented_normal.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/18px/segmented_selected.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/18px/segmented_selected.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/18px/segmented_selected_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/18px/segmented_selected_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/24px/segmented.css +0 -87
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/24px/segmented_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/24px/segmented_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/24px/segmented_normal.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/24px/segmented_normal.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/24px/segmented_selected.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/24px/segmented_selected.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/24px/segmented_selected_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/24px/segmented_selected_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/30px/segmented.css +0 -93
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/30px/segmented_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/30px/segmented_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/30px/segmented_normal.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/30px/segmented_normal.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/30px/segmented_selected.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/30px/segmented_selected.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/30px/segmented_selected_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/30px/segmented_selected_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/44px/segmented.css +0 -101
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/44px/segmented_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/44px/segmented_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/44px/segmented_normal.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/44px/segmented_normal.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/44px/segmented_selected.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/44px/segmented_selected.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/44px/segmented_selected_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/44px/segmented_selected_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/segmented.css +0 -73
- data/lib/frameworks/sproutcore/themes/ace/src/controls/segmented/segmented.js +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/select/active_select.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/select/active_select.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/select/menu.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/select/normal_select.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/select/normal_select.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/select/select.css +0 -45
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/14px/knob.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/14px/knob.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/14px/knob_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/14px/knob_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/14px/slider.css +0 -43
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/16px/knob.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/16px/knob.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/16px/knob_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/16px/knob_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/16px/slider.css +0 -44
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/22px/knob.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/22px/knob.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/22px/knob_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/22px/knob_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/22px/slider.css +0 -44
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/22px/track.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/22px/track.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/slider.css +0 -3
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/slider.js +0 -27
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/track.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/slider/track.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/switch/24px/switch.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/switch/24px/switch_handle.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/switch/24px/switch_handle.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/switch/24px/switch_off.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/switch/24px/switch_off.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/switch/24px/switch_on.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/controls/switch/24px/switch_on.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/core/loading.css +0 -50
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/active_button_capsule.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/active_button_capsule.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/active_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/active_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/button_view.css +0 -142
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/normal_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/normal_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/normal_button_capsule.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/normal_button_capsule.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/normal_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/normal_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_active_button_capsule.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_active_button_capsule.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_active_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_active_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_button_capsule.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_button_capsule.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/24px/selected_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/active_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/active_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/button_view_30.css +0 -111
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/normal_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/normal_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/normal_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/normal_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/selected_active_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/selected_active_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/selected_active_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/selected_active_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/selected_button.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/selected_button.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/selected_button_pointer.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/30px/selected_button_pointer.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/button.css +0 -20
- data/lib/frameworks/sproutcore/themes/ace/src/dark/buttons/button.js +0 -3
- data/lib/frameworks/sproutcore/themes/ace/src/form/iphone/form.js +0 -21
- data/lib/frameworks/sproutcore/themes/ace/src/form/iphone/form_row.js +0 -24
- data/lib/frameworks/sproutcore/themes/ace/src/form/iphone/iphone.css +0 -51
- data/lib/frameworks/sproutcore/themes/ace/src/form/iphone/iphone.js +0 -14
- data/lib/frameworks/sproutcore/themes/ace/src/form/iphone/label.js +0 -32
- data/lib/frameworks/sproutcore/themes/ace/src/panels/pane.css +0 -3
- data/lib/frameworks/sproutcore/themes/ace/src/panels/panel.css +0 -70
- data/lib/frameworks/sproutcore/themes/ace/src/panels/panel.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/panel.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/checkmark.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/checkmark.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/checkmark_active.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/checkmark_active.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/down.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/down.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/menu.css +0 -154
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/menu.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/menu.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/menu_item.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/menu_item.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/up.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/menu/up.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/picker.css +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/picker.js +0 -1
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/picker.js +0 -14
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover.css +0 -271
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover.js +0 -5
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover_empty.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover_empty.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover_notoolbar.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover_notoolbar.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover_pointers.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover_pointers.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover_pointers_notoolbar.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover_pointers_notoolbar.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/popover_sourcelist.css +0 -5
- data/lib/frameworks/sproutcore/themes/ace/src/panels/picker/popover/workspace.js +0 -51
- data/lib/frameworks/sproutcore/themes/ace/src/theme.js +0 -12
- data/lib/frameworks/sproutcore/themes/ace/src/toolbars/normal/selection.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/toolbars/normal/toolbar.css +0 -8
- data/lib/frameworks/sproutcore/themes/ace/src/toolbars/normal/toolbar.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/toolbars/normal/toolbar.psd +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/toolbars/panel_header/panel_header.png +0 -0
- data/lib/frameworks/sproutcore/themes/ace/src/toolbars/panel_header/panel_header.psd +0 -0
- data/lib/frameworks/sproutcore/themes/empty_theme/theme.js +0 -16
@@ -99,7 +99,16 @@ SC.SelectFieldView = SC.FieldView.extend(
|
|
99
99
|
sortObjects: function(objects) {
|
100
100
|
if(!this.get('disableSort')){
|
101
101
|
var nameKey = this.get('sortKey') || this.get('nameKey') ;
|
102
|
-
objects = objects.sortProperty(nameKey);
|
102
|
+
if(nameKey) objects = objects.sortProperty(nameKey);
|
103
|
+
else{
|
104
|
+
objects = objects.sort(function(a,b) {
|
105
|
+
if (nameKey) {
|
106
|
+
a = a.get ? a.get(nameKey) : a[nameKey] ;
|
107
|
+
b = b.get ? b.get(nameKey) : b[nameKey] ;
|
108
|
+
}
|
109
|
+
return (a<b) ? -1 : ((a>b) ? 1 : 0) ;
|
110
|
+
}) ;
|
111
|
+
}
|
103
112
|
}
|
104
113
|
return objects ;
|
105
114
|
},
|
@@ -25,6 +25,13 @@ SC.SliderView = SC.View.extend(SC.Control,
|
|
25
25
|
|
26
26
|
classNames: 'sc-slider-view',
|
27
27
|
|
28
|
+
/**
|
29
|
+
The DOM element that displays the handle. This element will have its
|
30
|
+
top-left corner updated to reflect the current state of the slider. Use
|
31
|
+
margin-offsets to properly position your handle over this location.
|
32
|
+
*/
|
33
|
+
handleSelector: 'img.sc-handle',
|
34
|
+
|
28
35
|
/**
|
29
36
|
Bind this to the current value of the progress bar. Note that by default
|
30
37
|
an empty value will disable the progress bar and a multiple value too make
|
@@ -76,11 +83,9 @@ SC.SliderView = SC.View.extend(SC.Control,
|
|
76
83
|
|
77
84
|
displayProperties: 'value minimum maximum'.w(),
|
78
85
|
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
updateRenderer: function(r) {
|
86
|
+
render: function(context, firstTime) {
|
87
|
+
sc_super();
|
88
|
+
|
84
89
|
var min = this.get('minimum'),
|
85
90
|
max = this.get('maximum'),
|
86
91
|
value = this.get('value'),
|
@@ -97,10 +102,19 @@ SC.SliderView = SC.View.extend(SC.Control,
|
|
97
102
|
// determine the percent across
|
98
103
|
if(value!==0) value = Math.floor((value - min) / (max - min) * 100);
|
99
104
|
|
100
|
-
|
101
|
-
|
102
|
-
"
|
103
|
-
|
105
|
+
if(firstTime) {
|
106
|
+
var blankImage = SC.BLANK_IMAGE_URL;
|
107
|
+
context.push('<span class="sc-inner">',
|
108
|
+
'<span class="sc-leftcap"></span>',
|
109
|
+
'<span class="sc-rightcap"></span>',
|
110
|
+
'<img src="', blankImage,
|
111
|
+
'" class="sc-handle" style="left: ', value, '%" />',
|
112
|
+
'</span>');
|
113
|
+
}
|
114
|
+
else {
|
115
|
+
this.$(this.get('handleSelector')).css('left', value + "%");
|
116
|
+
}
|
117
|
+
|
104
118
|
},
|
105
119
|
|
106
120
|
_isMouseDown: NO,
|
@@ -109,7 +123,7 @@ SC.SliderView = SC.View.extend(SC.Control,
|
|
109
123
|
if (!this.get('isEnabled')) return YES; // nothing to do...
|
110
124
|
this.set('isActive', YES);
|
111
125
|
this._isMouseDown = YES ;
|
112
|
-
return this._triggerHandle(evt,
|
126
|
+
return this._triggerHandle(evt, true);
|
113
127
|
},
|
114
128
|
|
115
129
|
// mouseDragged uses same technique as mouseDown.
|
@@ -156,7 +170,7 @@ SC.SliderView = SC.View.extend(SC.Control,
|
|
156
170
|
*/
|
157
171
|
_triggerHandle: function(evt, firstEvent) {
|
158
172
|
var width = this.get('frame').width,
|
159
|
-
min = this.get('minimum'), max=this.get('maximum'),
|
173
|
+
min = this.get('minimum'), max=this.get('maximum'),
|
160
174
|
step = this.get('step'), v=this.get('value'), loc;
|
161
175
|
|
162
176
|
if(firstEvent){
|
@@ -166,32 +180,19 @@ SC.SliderView = SC.View.extend(SC.Control,
|
|
166
180
|
loc = evt.pageX-this._evtDiff;
|
167
181
|
}
|
168
182
|
|
169
|
-
//
|
170
|
-
loc = Math.max(
|
171
|
-
|
172
|
-
// if the location is NOT in the general vicinity of the slider, we assume
|
173
|
-
// that the mouse pointer or touch is in the center of where the knob should be.
|
174
|
-
// otherwise, if we are starting, we need to do extra to add an offset
|
175
|
-
if (firstEvent) {
|
176
|
-
var value = this.get("value");
|
177
|
-
value = (value - min) / (max - min);
|
178
|
-
|
179
|
-
// if the value and the loc are within 16px
|
180
|
-
if (Math.abs(value * width - loc * width) < 16) this._offset = value - loc;
|
181
|
-
else this._offset = 0;
|
182
|
-
}
|
183
|
+
// constrain loc to 8px on either side (left to allow knob overhang)
|
184
|
+
loc = Math.max(Math.min(loc,width-8), 8) - 8;
|
185
|
+
width -= 16 ; // reduce by margin
|
183
186
|
|
184
|
-
//
|
185
|
-
loc = loc
|
187
|
+
// convert to percentage
|
188
|
+
loc = loc / width ;
|
186
189
|
|
187
190
|
// convert to value using minimum/maximum then constrain to steps
|
188
191
|
loc = min + ((max-min)*loc);
|
189
192
|
if (step !== 0) loc = Math.round(loc / step) * step ;
|
190
|
-
|
193
|
+
|
191
194
|
// if changes by more than a rounding amount, set v.
|
192
|
-
if (Math.abs(v-loc)>=0.01)
|
193
|
-
this.set('value', loc); // adjust
|
194
|
-
}
|
195
|
+
if (Math.abs(v-loc)>=0.01) this.set('value', loc); // adjust
|
195
196
|
return YES ;
|
196
197
|
},
|
197
198
|
|
@@ -207,7 +208,7 @@ SC.SliderView = SC.View.extend(SC.Control,
|
|
207
208
|
this._isFocused = YES ;
|
208
209
|
this.becomeFirstResponder();
|
209
210
|
if (this.get('isVisibleInWindow')) {
|
210
|
-
|
211
|
+
this.$()[0].focus();
|
211
212
|
}
|
212
213
|
}
|
213
214
|
},
|
@@ -282,4 +283,4 @@ SC.SliderView = SC.View.extend(SC.Control,
|
|
282
283
|
.endPropertyChanges();
|
283
284
|
}
|
284
285
|
|
285
|
-
});
|
286
|
+
});
|
@@ -58,6 +58,13 @@ SC.RESIZE_BOTTOM_RIGHT = 'resize-bottom-right';
|
|
58
58
|
This property should be set when the view is created. Changing it
|
59
59
|
dynamically will have an unknown effect.
|
60
60
|
|
61
|
+
@property {Boolean} layoutDirection Either SC.HORIZONTAL or SC.VERTICAL.
|
62
|
+
Defaults to SC.HORIZONTAL. Use the :direction option with the split_view
|
63
|
+
viewhelper.
|
64
|
+
|
65
|
+
@property {Boolean} canCollapseViews Set to NO when you don't want any of
|
66
|
+
the child views to collapse. Defaults to YES.
|
67
|
+
|
61
68
|
In addition, the top/left and bottom/right child views can have these
|
62
69
|
properties:
|
63
70
|
|
@@ -84,15 +91,11 @@ SC.SplitView = SC.View.extend(
|
|
84
91
|
Direction of layout. Must be SC.LAYOUT_HORIZONTAL or SC.LAYOUT_VERTICAL.
|
85
92
|
|
86
93
|
@property {String}
|
87
|
-
@default SC.LAYOUT_HORIZONTAL
|
88
94
|
*/
|
89
95
|
layoutDirection: SC.LAYOUT_HORIZONTAL,
|
90
96
|
|
91
97
|
/**
|
92
98
|
Set to NO to disable collapsing for all views.
|
93
|
-
|
94
|
-
@property {Boolean}
|
95
|
-
@default YES
|
96
99
|
*/
|
97
100
|
canCollapseViews: YES,
|
98
101
|
|
@@ -103,8 +106,6 @@ SC.SplitView = SC.View.extend(
|
|
103
106
|
| SC.RESIZE_BOTTOM_RIGHT | (default) resizes bottomRightView |
|
104
107
|
| SC.RESIZE_TOP_LEFT | resized topLeftView |
|
105
108
|
|
106
|
-
@property {String}
|
107
|
-
@default SC.RESIZE_BOTTOM_RIGHT
|
108
109
|
*/
|
109
110
|
autoresizeBehavior: SC.RESIZE_BOTTOM_RIGHT,
|
110
111
|
|
@@ -117,87 +118,21 @@ SC.SplitView = SC.View.extend(
|
|
117
118
|
autoresizeBehavior.
|
118
119
|
|
119
120
|
@property {Number}
|
120
|
-
@default 0.5
|
121
121
|
*/
|
122
122
|
defaultThickness: 0.5,
|
123
|
-
|
124
|
-
/**
|
125
|
-
Sets minimum thickness of topLeft view.
|
126
|
-
|
127
|
-
@property {Number}
|
128
|
-
@default null
|
129
|
-
*/
|
130
|
-
topLeftMinThickness: null,
|
131
|
-
|
132
|
-
/**
|
133
|
-
Sets maximum thickness of topLeft view.
|
134
|
-
|
135
|
-
@property {Number}
|
136
|
-
@default null
|
137
|
-
*/
|
138
|
-
topLeftMaxThickness: null,
|
139
|
-
|
140
|
-
/**
|
141
|
-
Sets minimum thickness of bottomRight view.
|
142
|
-
|
143
|
-
@property {Number}
|
144
|
-
@default null
|
145
|
-
*/
|
146
|
-
bottomRightMinThickness: null,
|
147
|
-
|
148
|
-
/**
|
149
|
-
Sets maximum thickness of bottomRight view.
|
150
|
-
|
151
|
-
@property {Number}
|
152
|
-
@default null
|
153
|
-
*/
|
154
|
-
bottomRightMaxThickness: null,
|
155
|
-
|
156
|
-
/**
|
157
|
-
Sets thickness of divider.
|
158
|
-
|
159
|
-
@property {Number}
|
160
|
-
@default null
|
161
|
-
*/
|
162
|
-
dividerThickness: null,
|
163
|
-
|
123
|
+
|
164
124
|
/**
|
165
125
|
Yes, we're a split view.
|
166
|
-
|
167
|
-
@property {Boolean}
|
168
|
-
@default YES
|
169
126
|
*/
|
170
127
|
isSplitView: YES,
|
171
128
|
|
172
|
-
|
173
|
-
The view to use for the top left
|
174
|
-
|
175
|
-
@property {SC.View}
|
176
|
-
@default SC.View
|
177
|
-
*/
|
129
|
+
// add default views
|
178
130
|
topLeftView: SC.View,
|
179
|
-
|
180
|
-
/**
|
181
|
-
The view to use for the divider
|
182
|
-
|
183
|
-
@property {SC.View}
|
184
|
-
@default SC.SplitDividerView
|
185
|
-
*/
|
186
131
|
dividerView: SC.SplitDividerView,
|
187
|
-
|
188
|
-
/**
|
189
|
-
The view to use for the bottom right
|
190
|
-
|
191
|
-
@property {SC.View}
|
192
|
-
@default SC.View
|
193
|
-
*/
|
194
132
|
bottomRightView: SC.View,
|
195
133
|
|
196
134
|
/**
|
197
135
|
The current thickness for the topLeftView
|
198
|
-
|
199
|
-
@property {Number}
|
200
|
-
@isReadOnly
|
201
136
|
*/
|
202
137
|
topLeftThickness: function() {
|
203
138
|
var view = this.get('topLeftView');
|
@@ -206,9 +141,6 @@ SC.SplitView = SC.View.extend(
|
|
206
141
|
|
207
142
|
/**
|
208
143
|
The current thickness for the bottomRightView
|
209
|
-
|
210
|
-
@property {Number}
|
211
|
-
@isReadOnly
|
212
144
|
*/
|
213
145
|
bottomRightThickness: function() {
|
214
146
|
var view = this.get('bottomRightView');
|
@@ -216,21 +148,16 @@ SC.SplitView = SC.View.extend(
|
|
216
148
|
}.property('bottomRightView').cacheable(),
|
217
149
|
|
218
150
|
/**
|
219
|
-
|
220
|
-
|
221
|
-
@property {SC.Cursor}
|
222
|
-
@default null
|
151
|
+
@property {SC.Cursor} the cursor thumb view should use for themselves
|
223
152
|
*/
|
224
153
|
thumbViewCursor: null,
|
225
154
|
|
226
155
|
/**
|
227
156
|
Used by split divider to decide if the view can be collapsed.
|
228
|
-
|
229
|
-
@property {Boolean}
|
230
|
-
@isReadOnly
|
231
157
|
*/
|
232
158
|
canCollapseView: function(view) {
|
233
|
-
return this.invokeDelegateMethod(this.delegate, 'splitViewCanCollapse',
|
159
|
+
return this.invokeDelegateMethod(this.delegate, 'splitViewCanCollapse',
|
160
|
+
this, view) ;
|
234
161
|
},
|
235
162
|
|
236
163
|
/**
|
@@ -240,35 +167,28 @@ SC.SplitView = SC.View.extend(
|
|
240
167
|
@returns the view with the width.
|
241
168
|
*/
|
242
169
|
thicknessForView: function(view) {
|
243
|
-
var direction = this.get('layoutDirection'),
|
244
|
-
ret = view.get('frame');
|
245
|
-
return (direction === SC.LAYOUT_HORIZONTAL) ? ret.width : ret.height;
|
170
|
+
var direction = this.get('layoutDirection') ,
|
171
|
+
ret = view.get('frame') ;
|
172
|
+
return (direction === SC.LAYOUT_HORIZONTAL) ? ret.width : ret.height ;
|
246
173
|
},
|
247
174
|
|
248
|
-
/**
|
249
|
-
Creates the topLeftView/dividerView/bottomRightView and adds them to the
|
250
|
-
childViews array
|
251
|
-
|
252
|
-
@returns SC.View the SplitDivider view (this)
|
253
|
-
*/
|
254
175
|
createChildViews: function() {
|
255
|
-
var childViews = [],
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
view = this[views[i]] = this.createChildView(view, {
|
176
|
+
var childViews = [] ,
|
177
|
+
viewAry = ['topLeftView', 'dividerView', 'bottomRightView'] ,
|
178
|
+
view, idx, len ;
|
179
|
+
|
180
|
+
for (idx=0, len=viewAry.length; idx<len; ++idx) {
|
181
|
+
if (view = this.get(viewAry[idx])) {
|
182
|
+
view = this[viewAry[idx]] = this.createChildView(view, {
|
263
183
|
layoutView: this,
|
264
|
-
rootElementPath: [
|
265
|
-
});
|
266
|
-
childViews.push(view);
|
184
|
+
rootElementPath: [idx]
|
185
|
+
}) ;
|
186
|
+
childViews.push(view) ;
|
267
187
|
}
|
268
188
|
}
|
269
189
|
|
270
|
-
this.set('childViews', childViews);
|
271
|
-
return this;
|
190
|
+
this.set('childViews', childViews) ;
|
191
|
+
return this ;
|
272
192
|
},
|
273
193
|
|
274
194
|
/**
|
@@ -279,60 +199,56 @@ SC.SplitView = SC.View.extend(
|
|
279
199
|
that they can resize appropriately.
|
280
200
|
*/
|
281
201
|
updateChildLayout: function() {
|
282
|
-
var topLeftView = this.get('topLeftView'),
|
283
|
-
bottomRightView = this.get('bottomRightView'),
|
284
|
-
dividerView = this.get('dividerView'),
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
layout, isCollapsed;
|
293
|
-
|
294
|
-
dividerThickness = (!SC.none(dividerThickness)) ? dividerThickness : 7;
|
202
|
+
var topLeftView = this.get('topLeftView') ,
|
203
|
+
bottomRightView = this.get('bottomRightView') ,
|
204
|
+
dividerView = this.get('dividerView') ,
|
205
|
+
direction = this.get('layoutDirection') ,
|
206
|
+
topLeftThickness = this._desiredTopLeftThickness ;
|
207
|
+
var dividerThickness = this.get('dividerThickness') ;
|
208
|
+
dividerThickness = (!SC.none(dividerThickness)) ? dividerThickness : 7 ;
|
209
|
+
var splitViewThickness = (direction === SC.LAYOUT_HORIZONTAL) ? this.get('frame').width : this.get('frame').height ,
|
210
|
+
bottomRightThickness = splitViewThickness - dividerThickness - topLeftThickness ,
|
211
|
+
autoresizeBehavior = this.get('autoresizeBehavior') ,
|
212
|
+
layout , isCollapsed ;
|
213
|
+
|
295
214
|
|
296
215
|
// top/left view
|
297
|
-
isCollapsed = topLeftView.get('isCollapsed') || NO;
|
298
|
-
topLeftView.setIfChanged('isVisible', !isCollapsed);
|
216
|
+
isCollapsed = topLeftView.get('isCollapsed') || NO ;
|
217
|
+
topLeftView.setIfChanged('isVisible', !isCollapsed) ;
|
299
218
|
layout = SC.clone(topLeftView.get('layout'));
|
300
|
-
|
301
219
|
if (direction === SC.LAYOUT_HORIZONTAL) {
|
302
|
-
layout.top = 0;
|
303
|
-
layout.left = 0;
|
304
|
-
layout.bottom = 0;
|
305
|
-
|
220
|
+
layout.top = 0 ;
|
221
|
+
layout.left = 0 ;
|
222
|
+
layout.bottom = 0 ;
|
306
223
|
switch (autoresizeBehavior) {
|
307
224
|
case SC.RESIZE_BOTH:
|
308
225
|
throw "SC.RESIZE_BOTH is currently unsupported.";
|
309
226
|
case SC.RESIZE_TOP_LEFT:
|
310
|
-
layout.right = bottomRightThickness + dividerThickness;
|
311
|
-
delete layout.width;
|
312
|
-
break;
|
227
|
+
layout.right = bottomRightThickness + dividerThickness ;
|
228
|
+
delete layout.width ;
|
229
|
+
break ;
|
313
230
|
case SC.RESIZE_BOTTOM_RIGHT:
|
314
|
-
delete layout.right;
|
315
|
-
delete layout.height;
|
316
|
-
layout.width = topLeftThickness;
|
317
|
-
break;
|
231
|
+
delete layout.right ;
|
232
|
+
delete layout.height ;
|
233
|
+
layout.width = topLeftThickness ;
|
234
|
+
break ;
|
318
235
|
}
|
319
236
|
} else {
|
320
237
|
layout.top = 0;
|
321
|
-
layout.left = 0;
|
322
|
-
layout.right = 0;
|
323
|
-
|
238
|
+
layout.left = 0 ;
|
239
|
+
layout.right = 0 ;
|
324
240
|
switch (autoresizeBehavior) {
|
325
241
|
case SC.RESIZE_BOTH:
|
326
242
|
throw "SC.RESIZE_BOTH is currently unsupported.";
|
327
243
|
case SC.RESIZE_TOP_LEFT:
|
328
|
-
layout.bottom = bottomRightThickness + dividerThickness;
|
329
|
-
delete layout.height;
|
330
|
-
break;
|
244
|
+
layout.bottom = bottomRightThickness + dividerThickness ;
|
245
|
+
delete layout.height ;
|
246
|
+
break ;
|
331
247
|
case SC.RESIZE_BOTTOM_RIGHT:
|
332
|
-
layout.
|
333
|
-
delete layout.
|
334
|
-
|
335
|
-
break;
|
248
|
+
delete layout.bottom ;
|
249
|
+
delete layout.width ;
|
250
|
+
layout.height = topLeftThickness ;
|
251
|
+
break ;
|
336
252
|
}
|
337
253
|
}
|
338
254
|
topLeftView.set('layout', layout);
|
@@ -340,13 +256,11 @@ SC.SplitView = SC.View.extend(
|
|
340
256
|
// split divider view
|
341
257
|
if (dividerView) {
|
342
258
|
layout = SC.clone(dividerView.get('layout'));
|
343
|
-
|
344
259
|
if (direction === SC.LAYOUT_HORIZONTAL) {
|
345
260
|
layout.width = dividerThickness;
|
346
|
-
layout.
|
347
|
-
layout.
|
348
|
-
|
349
|
-
|
261
|
+
delete layout.height ;
|
262
|
+
layout.top = 0 ;
|
263
|
+
layout.bottom = 0 ;
|
350
264
|
switch (autoresizeBehavior) {
|
351
265
|
case SC.RESIZE_BOTH:
|
352
266
|
throw "SC.RESIZE_BOTH is currently unsupported.";
|
@@ -356,24 +270,23 @@ SC.SplitView = SC.View.extend(
|
|
356
270
|
// delete layout.centerY ;
|
357
271
|
//break ;
|
358
272
|
case SC.RESIZE_TOP_LEFT:
|
359
|
-
layout.
|
360
|
-
|
361
|
-
delete layout.centerX;
|
362
|
-
delete layout.centerY;
|
363
|
-
break;
|
273
|
+
delete layout.left ;
|
274
|
+
layout.right = bottomRightThickness ;
|
275
|
+
delete layout.centerX ;
|
276
|
+
delete layout.centerY ;
|
277
|
+
break ;
|
364
278
|
case SC.RESIZE_BOTTOM_RIGHT:
|
365
|
-
layout.left = topLeftThickness;
|
366
|
-
delete layout.right;
|
367
|
-
delete layout.centerX;
|
368
|
-
delete layout.centerY;
|
369
|
-
break;
|
279
|
+
layout.left = topLeftThickness ;
|
280
|
+
delete layout.right ;
|
281
|
+
delete layout.centerX ;
|
282
|
+
delete layout.centerY ;
|
283
|
+
break ;
|
370
284
|
}
|
371
285
|
} else {
|
372
|
-
layout.
|
373
|
-
layout.
|
374
|
-
layout.
|
375
|
-
|
376
|
-
|
286
|
+
delete layout.width ;
|
287
|
+
layout.height = dividerThickness ;
|
288
|
+
layout.left = 0 ;
|
289
|
+
layout.right = 0 ;
|
377
290
|
switch (autoresizeBehavior) {
|
378
291
|
case SC.RESIZE_BOTH:
|
379
292
|
throw "SC.RESIZE_BOTH is currently unsupported.";
|
@@ -383,16 +296,16 @@ SC.SplitView = SC.View.extend(
|
|
383
296
|
// layout.centerY = topLeftThickness + (dividerThickness / 2) ;
|
384
297
|
//break ;
|
385
298
|
case SC.RESIZE_TOP_LEFT:
|
386
|
-
layout.
|
387
|
-
|
388
|
-
delete layout.centerX;
|
389
|
-
delete layout.centerY;
|
299
|
+
delete layout.top ;
|
300
|
+
layout.bottom = bottomRightThickness ;
|
301
|
+
delete layout.centerX ;
|
302
|
+
delete layout.centerY ;
|
390
303
|
break ;
|
391
304
|
case SC.RESIZE_BOTTOM_RIGHT:
|
392
|
-
layout.top = topLeftThickness;
|
393
|
-
delete layout.bottom;
|
394
|
-
delete layout.centerX;
|
395
|
-
delete layout.centerY;
|
305
|
+
layout.top = topLeftThickness ;
|
306
|
+
delete layout.bottom ;
|
307
|
+
delete layout.centerX ;
|
308
|
+
delete layout.centerY ;
|
396
309
|
break ;
|
397
310
|
}
|
398
311
|
}
|
@@ -400,126 +313,123 @@ SC.SplitView = SC.View.extend(
|
|
400
313
|
}
|
401
314
|
|
402
315
|
// bottom/right view
|
403
|
-
isCollapsed = bottomRightView.get('isCollapsed') || NO;
|
404
|
-
bottomRightView.setIfChanged('isVisible', !isCollapsed);
|
316
|
+
isCollapsed = bottomRightView.get('isCollapsed') || NO ;
|
317
|
+
bottomRightView.setIfChanged('isVisible', !isCollapsed) ;
|
405
318
|
layout = SC.clone(bottomRightView.get('layout'));
|
406
|
-
|
407
319
|
if (direction === SC.LAYOUT_HORIZONTAL) {
|
408
|
-
layout.top = 0;
|
409
|
-
layout.bottom = 0;
|
410
|
-
layout.right = 0;
|
411
|
-
|
320
|
+
layout.top = 0 ;
|
321
|
+
layout.bottom = 0 ;
|
322
|
+
layout.right = 0 ;
|
412
323
|
switch (autoresizeBehavior) {
|
413
324
|
case SC.RESIZE_BOTH:
|
414
325
|
throw "SC.RESIZE_BOTH is currently unsupported.";
|
326
|
+
//break ;
|
415
327
|
case SC.RESIZE_BOTTOM_RIGHT:
|
416
|
-
layout.left = topLeftThickness + dividerThickness;
|
417
|
-
delete layout.width;
|
418
|
-
break;
|
328
|
+
layout.left = topLeftThickness + dividerThickness ;
|
329
|
+
delete layout.width ;
|
330
|
+
break ;
|
419
331
|
case SC.RESIZE_TOP_LEFT:
|
420
|
-
layout.
|
421
|
-
|
422
|
-
break;
|
332
|
+
delete layout.left ;
|
333
|
+
layout.width = bottomRightThickness ;
|
334
|
+
break ;
|
423
335
|
}
|
424
336
|
} else {
|
425
|
-
layout.left = 0;
|
426
|
-
layout.right = 0;
|
427
|
-
layout.bottom = 0;
|
428
|
-
|
337
|
+
layout.left = 0 ;
|
338
|
+
layout.right = 0 ;
|
339
|
+
layout.bottom = 0 ;
|
429
340
|
switch (autoresizeBehavior) {
|
430
341
|
case SC.RESIZE_BOTH:
|
431
342
|
throw "SC.RESIZE_BOTH is currently unsupported.";
|
343
|
+
//break ;
|
432
344
|
case SC.RESIZE_BOTTOM_RIGHT:
|
433
|
-
layout.top = topLeftThickness + dividerThickness;
|
434
|
-
delete layout.height;
|
435
|
-
break;
|
345
|
+
layout.top = topLeftThickness + dividerThickness ;
|
346
|
+
delete layout.height ;
|
347
|
+
break ;
|
436
348
|
case SC.RESIZE_TOP_LEFT:
|
437
|
-
delete layout.top;
|
438
|
-
layout.height = bottomRightThickness;
|
439
|
-
break;
|
349
|
+
delete layout.top ;
|
350
|
+
layout.height = bottomRightThickness ;
|
351
|
+
break ;
|
440
352
|
}
|
441
353
|
}
|
442
354
|
bottomRightView.set('layout', layout);
|
443
355
|
|
444
|
-
this
|
445
|
-
|
446
|
-
.notifyPropertyChange('bottomRightThickness');
|
356
|
+
this.notifyPropertyChange('topLeftThickness')
|
357
|
+
.notifyPropertyChange('bottomRightThickness');
|
447
358
|
},
|
448
359
|
|
449
360
|
/** @private */
|
450
361
|
renderLayout: function(context, firstTime) {
|
451
362
|
if (firstTime || this._recalculateDivider) {
|
452
|
-
|
453
|
-
var layoutDirection = this.get('layoutDirection'),
|
454
|
-
frame = this.get('frame'),
|
455
|
-
elem = this.$(),
|
456
|
-
desiredThickness = this.get('defaultThickness') ,
|
457
|
-
autoResizeBehavior = this.get('autoresizeBehavior'),
|
458
|
-
dividerThickness = this.get('dividerThickness'),
|
459
|
-
splitViewThickness;
|
460
|
-
|
461
363
|
if (!this.get('thumbViewCursor')) {
|
462
|
-
this.set('thumbViewCursor', SC.Cursor.create());
|
364
|
+
this.set('thumbViewCursor', SC.Cursor.create()) ;
|
463
365
|
}
|
464
366
|
|
465
|
-
|
466
|
-
|
367
|
+
var layoutDirection = this.get('layoutDirection') ,
|
368
|
+
fr = this.get('frame'),
|
369
|
+
splitViewThickness, elemRendered = this.$(),
|
370
|
+
desiredThickness = this.get('defaultThickness') ,
|
371
|
+
autoResizeBehavior = this.get('autoresizeBehavior') ;
|
372
|
+
var dividerThickness = this.get('dividerThickness') ;
|
373
|
+
dividerThickness = (!SC.none(dividerThickness)) ? dividerThickness : 7 ;
|
467
374
|
// Turn a flag on to recalculate the spliting if the desired thickness
|
468
375
|
// is a percentage
|
469
|
-
if
|
470
|
-
this._recalculateDivider
|
471
|
-
} else if (this._recalculateDivider) {
|
472
|
-
this._recalculateDivider = NO;
|
376
|
+
if(this._recalculateDivider===undefined && desiredThickness<1) {
|
377
|
+
this._recalculateDivider=YES;
|
473
378
|
}
|
379
|
+
else if(this._recalculateDivider) this._recalculateDivider=NO;
|
474
380
|
|
475
|
-
if (elem[0]) {
|
476
|
-
splitViewThickness = (layoutDirection === SC.LAYOUT_HORIZONTAL) ? elem[0].offsetWidth : elem[0].offsetHeight;
|
477
|
-
} else {
|
478
|
-
splitViewThickness = (layoutDirection === SC.LAYOUT_HORIZONTAL) ? frame.width : frame.height;
|
479
|
-
}
|
480
381
|
|
382
|
+
if(elemRendered[0]) {
|
383
|
+
splitViewThickness = (layoutDirection === SC.LAYOUT_HORIZONTAL) ?
|
384
|
+
elemRendered[0].offsetWidth : elemRendered[0].offsetHeight ;
|
385
|
+
}else{
|
386
|
+
splitViewThickness = (layoutDirection === SC.LAYOUT_HORIZONTAL) ?
|
387
|
+
fr.width : fr.height ;
|
388
|
+
}
|
481
389
|
// if default thickness is < 1, convert from percentage to absolute
|
482
|
-
if (SC.none(desiredThickness) ||
|
483
|
-
desiredThickness
|
390
|
+
if (SC.none(desiredThickness) ||
|
391
|
+
(desiredThickness > 0 && desiredThickness < 1)) {
|
392
|
+
desiredThickness = Math.floor((splitViewThickness -
|
393
|
+
(dividerThickness))* (desiredThickness || 0.5)) ;
|
484
394
|
}
|
485
|
-
|
486
395
|
if (autoResizeBehavior === SC.RESIZE_BOTTOM_RIGHT) {
|
487
|
-
this._desiredTopLeftThickness = desiredThickness;
|
488
|
-
} else {
|
489
|
-
this._desiredTopLeftThickness =
|
396
|
+
this._desiredTopLeftThickness = desiredThickness ;
|
397
|
+
} else { // (autoResizeBehavior === SC.RESIZE_TOP_LEFT)
|
398
|
+
this._desiredTopLeftThickness = splitViewThickness
|
399
|
+
- dividerThickness - desiredThickness ;
|
490
400
|
}
|
491
401
|
|
492
402
|
// make sure we don't exceed our min and max values, and that collapse
|
493
403
|
// settings are respected
|
494
404
|
// cached values are required by _updateTopLeftThickness() below...
|
495
|
-
this._topLeftView = this.get('topLeftView');
|
496
|
-
this._bottomRightView = this.get('bottomRightView');
|
405
|
+
this._topLeftView = this.get('topLeftView') ;
|
406
|
+
this._bottomRightView = this.get('bottomRightView') ;
|
497
407
|
this._topLeftViewThickness = this.thicknessForView(this.get('topLeftView'));
|
498
408
|
this._bottomRightThickness = this.thicknessForView(this.get('bottomRightView'));
|
499
|
-
this._dividerThickness = this.get('dividerThickness');
|
500
|
-
this._layoutDirection = this.get('layoutDirection');
|
409
|
+
this._dividerThickness = this.get('dividerThickness') ;
|
410
|
+
this._layoutDirection = this.get('layoutDirection') ;
|
501
411
|
|
502
412
|
// this handles min-max settings and collapse parameters
|
503
|
-
this._updateTopLeftThickness(0);
|
413
|
+
this._updateTopLeftThickness(0) ;
|
504
414
|
|
505
415
|
// update the cursor used by thumb views
|
506
|
-
this._setCursorStyle();
|
416
|
+
this._setCursorStyle() ;
|
507
417
|
|
508
418
|
// actually set layout for our child views
|
509
|
-
this.updateChildLayout();
|
419
|
+
this.updateChildLayout() ;
|
510
420
|
}
|
511
|
-
|
512
|
-
sc_super();
|
421
|
+
sc_super() ;
|
513
422
|
},
|
514
423
|
|
515
424
|
/** @private */
|
516
425
|
render: function(context, firstTime) {
|
517
|
-
sc_super();
|
426
|
+
sc_super() ;
|
518
427
|
|
519
|
-
if (this._inLiveResize) this._setCursorStyle();
|
428
|
+
if (this._inLiveResize) this._setCursorStyle() ;
|
520
429
|
|
521
|
-
|
522
|
-
|
430
|
+
var dir = this.get('layoutDirection') ;
|
431
|
+
if (dir===SC.LAYOUT_HORIZONTAL) context.addClass('sc-horizontal') ;
|
432
|
+
else context.addClass('sc-vertical') ;
|
523
433
|
},
|
524
434
|
|
525
435
|
/**
|
@@ -532,44 +442,45 @@ SC.SplitView = SC.View.extend(
|
|
532
442
|
@returns {Boolean}
|
533
443
|
*/
|
534
444
|
mouseDownInThumbView: function(evt, thumbView) {
|
535
|
-
var responder = this.getPath('pane.rootResponder');
|
536
|
-
if (!responder) return NO; // nothing to do
|
445
|
+
var responder = this.getPath('pane.rootResponder') ;
|
446
|
+
if (!responder) return NO ; // nothing to do
|
537
447
|
|
538
448
|
// we're not the source view of the mouseDown:, so we need to capture events manually to receive them
|
539
|
-
responder.dragDidStart(this);
|
449
|
+
responder.dragDidStart(this) ;
|
540
450
|
|
541
451
|
// cache for later
|
542
|
-
this._mouseDownX = evt.pageX;
|
543
|
-
this._mouseDownY = evt.pageY;
|
544
|
-
this._thumbView = thumbView;
|
545
|
-
this._topLeftView = this.get('topLeftView');
|
546
|
-
this._bottomRightView = this.get('bottomRightView');
|
452
|
+
this._mouseDownX = evt.pageX ;
|
453
|
+
this._mouseDownY = evt.pageY ;
|
454
|
+
this._thumbView = thumbView ;
|
455
|
+
this._topLeftView = this.get('topLeftView') ;
|
456
|
+
this._bottomRightView = this.get('bottomRightView') ;
|
547
457
|
this._topLeftViewThickness = this.thicknessForView(this.get('topLeftView'));
|
548
458
|
this._bottomRightThickness = this.thicknessForView(this.get('bottomRightView'));
|
549
|
-
this._dividerThickness = this.get('dividerThickness');
|
550
|
-
this._layoutDirection = this.get('layoutDirection');
|
459
|
+
this._dividerThickness = this.get('dividerThickness') ;
|
460
|
+
this._layoutDirection = this.get('layoutDirection') ;
|
551
461
|
|
552
|
-
this.beginLiveResize();
|
553
|
-
this._inLiveResize = YES;
|
462
|
+
this.beginLiveResize() ;
|
463
|
+
this._inLiveResize = YES ;
|
554
464
|
|
555
|
-
return YES;
|
465
|
+
return YES ;
|
556
466
|
},
|
557
467
|
|
558
468
|
mouseDragged: function(evt) {
|
559
|
-
var offset = (this._layoutDirection === SC.LAYOUT_HORIZONTAL) ? evt.pageX
|
560
|
-
|
469
|
+
var offset = (this._layoutDirection === SC.LAYOUT_HORIZONTAL) ? evt.pageX
|
470
|
+
- this._mouseDownX : evt.pageY - this._mouseDownY ;
|
471
|
+
this._updateTopLeftThickness(offset) ;
|
561
472
|
return YES;
|
562
473
|
},
|
563
474
|
|
564
475
|
mouseUp: function(evt) {
|
565
476
|
if (this._inLiveResize === YES) {
|
566
|
-
this._thumbView = null; // avoid memory leaks
|
567
|
-
this._inLiveResize = NO;
|
568
|
-
this.endLiveResize();
|
569
|
-
return YES;
|
477
|
+
this._thumbView = null ; // avoid memory leaks
|
478
|
+
this._inLiveResize = NO ;
|
479
|
+
this.endLiveResize() ;
|
480
|
+
return YES ;
|
570
481
|
}
|
571
482
|
|
572
|
-
return NO;
|
483
|
+
return NO ;
|
573
484
|
},
|
574
485
|
|
575
486
|
touchesDragged: function(evt){
|
@@ -580,25 +491,25 @@ SC.SplitView = SC.View.extend(
|
|
580
491
|
return this.mouseUp(evt);
|
581
492
|
},
|
582
493
|
|
494
|
+
|
583
495
|
doubleClickInThumbView: function(evt, thumbView) {
|
584
496
|
var view = this._topLeftView,
|
585
|
-
isCollapsed = view.get('isCollapsed') || NO;
|
586
|
-
|
497
|
+
isCollapsed = view.get('isCollapsed') || NO ;
|
587
498
|
if (!isCollapsed && !this.canCollapseView(view)) {
|
588
|
-
view = this._bottomRightView;
|
589
|
-
isCollapsed = view.get('isCollapsed') || NO;
|
499
|
+
view = this._bottomRightView ;
|
500
|
+
isCollapsed = view.get('isCollapsed') || NO ;
|
590
501
|
if (!isCollapsed && !this.canCollapseView(view)) return NO;
|
591
502
|
}
|
592
503
|
|
593
504
|
if (!isCollapsed) {
|
594
505
|
// remember thickness in it's uncollapsed state
|
595
|
-
this._uncollapsedThickness = this.thicknessForView(view);
|
506
|
+
this._uncollapsedThickness = this.thicknessForView(view) ;
|
596
507
|
// and collapse
|
597
508
|
// this.setThicknessForView(view, 0) ;
|
598
509
|
if (view === this._topLeftView) {
|
599
|
-
this._updateTopLeftThickness(this.topLeftThickness()*-1);
|
510
|
+
this._updateTopLeftThickness(this.topLeftThickness()*-1) ;
|
600
511
|
} else {
|
601
|
-
this._updateBottomRightThickness(this.bottomRightThickness()*-1);
|
512
|
+
this._updateBottomRightThickness(this.bottomRightThickness()*-1) ;
|
602
513
|
}
|
603
514
|
|
604
515
|
// if however the splitview decided not to collapse, clear:
|
@@ -608,24 +519,24 @@ SC.SplitView = SC.View.extend(
|
|
608
519
|
} else {
|
609
520
|
// uncollapse to the last thickness in it's uncollapsed state
|
610
521
|
if (view === this._topLeftView) {
|
611
|
-
this._updateTopLeftThickness(this._uncollapsedThickness);
|
522
|
+
this._updateTopLeftThickness(this._uncollapsedThickness) ;
|
612
523
|
} else {
|
613
|
-
this._updateBottomRightThickness(this._uncollapsedThickness);
|
524
|
+
this._updateBottomRightThickness(this._uncollapsedThickness) ;
|
614
525
|
}
|
615
|
-
view._uncollapsedThickness = null;
|
526
|
+
view._uncollapsedThickness = null ;
|
616
527
|
}
|
617
|
-
this._setCursorStyle();
|
618
|
-
return true;
|
528
|
+
this._setCursorStyle() ;
|
529
|
+
return true ;
|
619
530
|
},
|
620
531
|
|
621
532
|
/** @private */
|
622
533
|
_updateTopLeftThickness: function(offset) {
|
623
|
-
var topLeftView = this._topLeftView,
|
534
|
+
var topLeftView = this._topLeftView ,
|
624
535
|
bottomRightView = this._bottomRightView,
|
625
536
|
// the current thickness, not the original thickness
|
626
537
|
topLeftViewThickness = this.thicknessForView(topLeftView),
|
627
538
|
bottomRightViewThickness = this.thicknessForView(bottomRightView),
|
628
|
-
minAvailable = this._dividerThickness,
|
539
|
+
minAvailable = this._dividerThickness ,
|
629
540
|
maxAvailable = 0,
|
630
541
|
proposedThickness = this._topLeftViewThickness + offset,
|
631
542
|
direction = this._layoutDirection,
|
@@ -637,50 +548,53 @@ SC.SplitView = SC.View.extend(
|
|
637
548
|
bottomRightThickness, tlCollapseAtThickness, brCollapseAtThickness;
|
638
549
|
|
639
550
|
if (!topLeftView.get("isCollapsed")) {
|
640
|
-
maxAvailable += topLeftViewThickness;
|
551
|
+
maxAvailable += topLeftViewThickness ;
|
641
552
|
}
|
642
553
|
if (!bottomRightView.get("isCollapsed")) {
|
643
|
-
maxAvailable += bottomRightViewThickness;
|
554
|
+
maxAvailable += bottomRightViewThickness ;
|
644
555
|
}
|
645
556
|
|
646
|
-
if (!SC.none(max)) thickness = Math.min(max, thickness);
|
647
|
-
if (!SC.none(min)) thickness = Math.max(min, thickness);
|
557
|
+
if (!SC.none(max)) thickness = Math.min(max, thickness) ;
|
558
|
+
if (!SC.none(min)) thickness = Math.max(min, thickness) ;
|
648
559
|
|
649
560
|
// constrain to thickness set on bottom/right
|
650
|
-
max = this.get('bottomRightMaxThickness');
|
651
|
-
min = this.get('bottomRightMinThickness');
|
652
|
-
bottomRightThickness = maxAvailable - thickness;
|
561
|
+
max = this.get('bottomRightMaxThickness') ;
|
562
|
+
min = this.get('bottomRightMinThickness') ;
|
563
|
+
bottomRightThickness = maxAvailable - thickness ;
|
653
564
|
if (!SC.none(max)) {
|
654
|
-
bottomRightThickness = Math.min(max, bottomRightThickness);
|
565
|
+
bottomRightThickness = Math.min(max, bottomRightThickness) ;
|
655
566
|
}
|
656
567
|
if (!SC.none(min)) {
|
657
|
-
bottomRightThickness = Math.max(min, bottomRightThickness);
|
568
|
+
bottomRightThickness = Math.max(min, bottomRightThickness) ;
|
658
569
|
}
|
659
|
-
thickness = maxAvailable - bottomRightThickness;
|
570
|
+
thickness = maxAvailable - bottomRightThickness ;
|
660
571
|
|
661
572
|
// constrain to thickness determined by delegate.
|
662
573
|
thickness = this.invokeDelegateMethod(this.delegate,
|
663
|
-
'splitViewConstrainThickness', this, topLeftView, thickness);
|
574
|
+
'splitViewConstrainThickness', this, topLeftView, thickness) ;
|
664
575
|
|
665
576
|
// cannot be more than what's available
|
666
|
-
thickness = Math.min(thickness, maxAvailable);
|
577
|
+
thickness = Math.min(thickness, maxAvailable) ;
|
667
578
|
|
668
579
|
// cannot be less than zero
|
669
|
-
thickness = Math.max(0, thickness);
|
580
|
+
thickness = Math.max(0, thickness) ;
|
670
581
|
|
671
|
-
tlCollapseAtThickness = topLeftView.get('collapseAtThickness');
|
672
|
-
if (!tlCollapseAtThickness) tlCollapseAtThickness = 0;
|
673
|
-
brCollapseAtThickness = bottomRightView.get('collapseAtThickness');
|
674
|
-
brCollapseAtThickness = SC.none(brCollapseAtThickness) ?
|
582
|
+
tlCollapseAtThickness = topLeftView.get('collapseAtThickness') ;
|
583
|
+
if (!tlCollapseAtThickness) tlCollapseAtThickness = 0 ;
|
584
|
+
brCollapseAtThickness = bottomRightView.get('collapseAtThickness') ;
|
585
|
+
brCollapseAtThickness = SC.none(brCollapseAtThickness) ?
|
586
|
+
maxAvailable : (maxAvailable - brCollapseAtThickness);
|
675
587
|
|
676
|
-
if ((proposedThickness <= tlCollapseAtThickness) &&
|
588
|
+
if ((proposedThickness <= tlCollapseAtThickness) &&
|
589
|
+
this.canCollapseView(topLeftView)) {
|
677
590
|
// want to collapse top/left, check if this doesn't violate the max thickness of bottom/right
|
678
591
|
max = bottomRightView.get('maxThickness');
|
679
592
|
if (!max || (minAvailable + maxAvailable) <= max) {
|
680
593
|
// collapse top/left view, even if it has a minThickness
|
681
|
-
thickness = 0;
|
594
|
+
thickness = 0 ;
|
682
595
|
}
|
683
|
-
} else if (proposedThickness >= brCollapseAtThickness &&
|
596
|
+
} else if (proposedThickness >= brCollapseAtThickness &&
|
597
|
+
this.canCollapseView(bottomRightView)) {
|
684
598
|
// want to collapse bottom/right, check if this doesn't violate the max thickness of top/left
|
685
599
|
max = topLeftView.get('maxThickness');
|
686
600
|
if (!max || (minAvailable + maxAvailable) <= max) {
|
@@ -691,11 +605,11 @@ SC.SplitView = SC.View.extend(
|
|
691
605
|
|
692
606
|
// now apply constrained value
|
693
607
|
if (thickness != this.thicknessForView(topLeftView)) {
|
694
|
-
this._desiredTopLeftThickness = thickness;
|
608
|
+
this._desiredTopLeftThickness = thickness ;
|
695
609
|
|
696
610
|
// un-collapse if needed.
|
697
|
-
topLeftView.set('isCollapsed', thickness === 0);
|
698
|
-
bottomRightView.set('isCollapsed', thickness >= maxAvailable);
|
611
|
+
topLeftView.set('isCollapsed', thickness === 0) ;
|
612
|
+
bottomRightView.set('isCollapsed', thickness >= maxAvailable) ;
|
699
613
|
|
700
614
|
this.updateChildLayout(); // updates child layouts
|
701
615
|
this.displayDidChange(); // updates cursor
|
@@ -708,7 +622,7 @@ SC.SplitView = SC.View.extend(
|
|
708
622
|
bottomRightView = this._bottomRightView,
|
709
623
|
topLeftViewThickness = this.thicknessForView(topLeftView), // the current thickness, not the original thickness
|
710
624
|
bottomRightViewThickness = this.thicknessForView(bottomRightView),
|
711
|
-
minAvailable = this._dividerThickness,
|
625
|
+
minAvailable = this._dividerThickness ,
|
712
626
|
maxAvailable = 0,
|
713
627
|
proposedThickness = this._topLeftViewThickness + offset,
|
714
628
|
direction = this._layoutDirection,
|
@@ -719,32 +633,32 @@ SC.SplitView = SC.View.extend(
|
|
719
633
|
min = this.get('topLeftMinThickness'),
|
720
634
|
bottomRightThickness, tlCollapseAtThickness, brCollapseAtThickness;
|
721
635
|
|
722
|
-
if (!topLeftView.get("isCollapsed")) maxAvailable += topLeftViewThickness;
|
723
|
-
if (!bottomRightView.get("isCollapsed")) maxAvailable += bottomRightViewThickness;
|
636
|
+
if (!topLeftView.get("isCollapsed")) maxAvailable += topLeftViewThickness ;
|
637
|
+
if (!bottomRightView.get("isCollapsed")) maxAvailable += bottomRightViewThickness ;
|
724
638
|
|
725
|
-
if (!SC.none(max)) thickness = Math.min(max, thickness);
|
726
|
-
if (!SC.none(min)) thickness = Math.max(min, thickness);
|
639
|
+
if (!SC.none(max)) thickness = Math.min(max, thickness) ;
|
640
|
+
if (!SC.none(min)) thickness = Math.max(min, thickness) ;
|
727
641
|
|
728
642
|
// constrain to thickness set on bottom/right
|
729
|
-
max = this.get('bottomRightMaxThickness');
|
730
|
-
min = this.get('bottomRightMinThickness');
|
643
|
+
max = this.get('bottomRightMaxThickness') ;
|
644
|
+
min = this.get('bottomRightMinThickness') ;
|
731
645
|
bottomRightThickness = maxAvailable - thickness ;
|
732
|
-
if (!SC.none(max)) bottomRightThickness = Math.min(max, bottomRightThickness);
|
733
|
-
if (!SC.none(min)) bottomRightThickness = Math.max(min, bottomRightThickness);
|
734
|
-
thickness = maxAvailable - bottomRightThickness;
|
646
|
+
if (!SC.none(max)) bottomRightThickness = Math.min(max, bottomRightThickness) ;
|
647
|
+
if (!SC.none(min)) bottomRightThickness = Math.max(min, bottomRightThickness) ;
|
648
|
+
thickness = maxAvailable - bottomRightThickness ;
|
735
649
|
|
736
650
|
// constrain to thickness determined by delegate.
|
737
|
-
thickness = this.invokeDelegateMethod(this.delegate, 'splitViewConstrainThickness', this, topLeftView, thickness);
|
651
|
+
thickness = this.invokeDelegateMethod(this.delegate, 'splitViewConstrainThickness', this, topLeftView, thickness) ;
|
738
652
|
|
739
653
|
// cannot be more than what's available
|
740
|
-
thickness = Math.min(thickness, maxAvailable);
|
654
|
+
thickness = Math.min(thickness, maxAvailable) ;
|
741
655
|
|
742
656
|
// cannot be less than zero
|
743
|
-
thickness = Math.max(0, thickness);
|
657
|
+
thickness = Math.max(0, thickness) ;
|
744
658
|
|
745
|
-
tlCollapseAtThickness = topLeftView.get('collapseAtThickness');
|
746
|
-
if (!tlCollapseAtThickness) tlCollapseAtThickness = 0;
|
747
|
-
brCollapseAtThickness = bottomRightView.get('collapseAtThickness');
|
659
|
+
tlCollapseAtThickness = topLeftView.get('collapseAtThickness') ;
|
660
|
+
if (!tlCollapseAtThickness) tlCollapseAtThickness = 0 ;
|
661
|
+
brCollapseAtThickness = bottomRightView.get('collapseAtThickness') ;
|
748
662
|
brCollapseAtThickness = SC.none(brCollapseAtThickness) ? maxAvailable : (maxAvailable - brCollapseAtThickness);
|
749
663
|
|
750
664
|
if ((proposedThickness <= tlCollapseAtThickness) && this.canCollapseView(topLeftView)) {
|
@@ -752,7 +666,7 @@ SC.SplitView = SC.View.extend(
|
|
752
666
|
max = bottomRightView.get('maxThickness');
|
753
667
|
if (!max || (minAvailable + maxAvailable) <= max) {
|
754
668
|
// collapse top/left view, even if it has a minThickness
|
755
|
-
thickness = 0;
|
669
|
+
thickness = 0 ;
|
756
670
|
}
|
757
671
|
} else if (proposedThickness >= brCollapseAtThickness && this.canCollapseView(bottomRightView)) {
|
758
672
|
// want to collapse bottom/right, check if this doesn't violate the max thickness of top/left
|
@@ -765,11 +679,11 @@ SC.SplitView = SC.View.extend(
|
|
765
679
|
|
766
680
|
// now apply constrained value
|
767
681
|
if (thickness != this.thicknessForView(topLeftView)) {
|
768
|
-
this._desiredTopLeftThickness = thickness;
|
682
|
+
this._desiredTopLeftThickness = thickness ;
|
769
683
|
|
770
684
|
// un-collapse if needed.
|
771
|
-
topLeftView.set('isCollapsed', thickness === 0);
|
772
|
-
bottomRightView.set('isCollapsed', thickness >= maxAvailable);
|
685
|
+
topLeftView.set('isCollapsed', thickness === 0) ;
|
686
|
+
bottomRightView.set('isCollapsed', thickness >= maxAvailable) ;
|
773
687
|
|
774
688
|
this.updateChildLayout(); // updates child layouts
|
775
689
|
this.displayDidChange(); // updates cursor
|
@@ -790,21 +704,25 @@ SC.SplitView = SC.View.extend(
|
|
790
704
|
// mouseDownInThumbView() to reflect the status of the drag
|
791
705
|
tlThickness = this.thicknessForView(topLeftView),
|
792
706
|
brThickness = this.thicknessForView(bottomRightView);
|
793
|
-
this._layoutDirection = this.get('layoutDirection');
|
707
|
+
this._layoutDirection = this.get('layoutDirection') ;
|
794
708
|
if (topLeftView.get('isCollapsed') ||
|
795
|
-
|
796
|
-
|
797
|
-
thumbViewCursor.set('cursorStyle',
|
709
|
+
tlThickness === this.get("topLeftMinThickness") ||
|
710
|
+
brThickness == this.get("bottomRightMaxThickness")) {
|
711
|
+
thumbViewCursor.set('cursorStyle',
|
712
|
+
this._layoutDirection === SC.LAYOUT_HORIZONTAL ? "e-resize" : "s-resize") ;
|
798
713
|
} else if (bottomRightView.get('isCollapsed') ||
|
799
|
-
|
800
|
-
|
801
|
-
thumbViewCursor.set('cursorStyle',
|
714
|
+
tlThickness === this.get("topLeftMaxThickness") ||
|
715
|
+
brThickness == this.get("bottomRightMinThickness")) {
|
716
|
+
thumbViewCursor.set('cursorStyle',
|
717
|
+
this._layoutDirection === SC.LAYOUT_HORIZONTAL ? "w-resize" : "n-resize") ;
|
802
718
|
} else {
|
803
719
|
if(SC.browser.msie) {
|
804
|
-
thumbViewCursor.set('cursorStyle',
|
720
|
+
thumbViewCursor.set('cursorStyle',
|
721
|
+
this._layoutDirection === SC.LAYOUT_HORIZONTAL ? "e-resize" : "n-resize") ;
|
805
722
|
}
|
806
723
|
else {
|
807
|
-
thumbViewCursor.set('cursorStyle',
|
724
|
+
thumbViewCursor.set('cursorStyle',
|
725
|
+
this._layoutDirection === SC.LAYOUT_HORIZONTAL ? "ew-resize" : "ns-resize") ;
|
808
726
|
}
|
809
727
|
}
|
810
728
|
}.observes('layoutDirection'),
|
@@ -821,9 +739,9 @@ SC.SplitView = SC.View.extend(
|
|
821
739
|
@returns {Boolean} YES to allow collapse.
|
822
740
|
*/
|
823
741
|
splitViewCanCollapse: function(splitView, view) {
|
824
|
-
if (splitView.get('canCollapseViews') === NO) return NO;
|
825
|
-
if (view.get('canCollapse') === NO) return NO;
|
826
|
-
return YES;
|
742
|
+
if (splitView.get('canCollapseViews') === NO) return NO ;
|
743
|
+
if (view.get('canCollapse') === NO) return NO ;
|
744
|
+
return YES ;
|
827
745
|
},
|
828
746
|
|
829
747
|
/**
|
@@ -855,10 +773,9 @@ SC.SplitView = SC.View.extend(
|
|
855
773
|
@returns {void}
|
856
774
|
*/
|
857
775
|
viewDidResize: function() {
|
858
|
-
|
859
|
-
|
860
|
-
|
861
|
-
.notifyPropertyChange('bottomRightThickness');
|
776
|
+
sc_super();
|
777
|
+
this.notifyPropertyChange('topLeftThickness')
|
778
|
+
.notifyPropertyChange('bottomRightThickness');
|
862
779
|
}.observes('layout')
|
863
780
|
|
864
781
|
});
|