activeadmin 1.0.0 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of activeadmin might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.github/ISSUE_TEMPLATE.md +20 -0
- data/.mdlrc +1 -0
- data/.rubocop.yml +52 -3
- data/.simplecov +13 -0
- data/.travis.yml +9 -24
- data/.yardopts +0 -1
- data/CHANGELOG.md +85 -4
- data/CONTRIBUTING.md +33 -57
- data/Gemfile +26 -17
- data/Rakefile +1 -12
- data/activeadmin.gemspec +9 -11
- data/app/assets/javascripts/active_admin/base.js.coffee +6 -2
- data/app/assets/javascripts/active_admin/initializers/batch_actions.js.coffee +5 -1
- data/app/assets/javascripts/active_admin/initializers/datepicker.js.coffee +5 -1
- data/app/assets/javascripts/active_admin/initializers/filters.js.coffee +5 -1
- data/app/assets/javascripts/active_admin/initializers/tabs.js.coffee +5 -1
- data/app/assets/javascripts/active_admin/lib/batch_actions.js.coffee +6 -3
- data/app/assets/javascripts/active_admin/lib/checkbox-toggler.js.coffee +9 -7
- data/app/assets/javascripts/active_admin/lib/dropdown-menu.js.coffee +5 -2
- data/app/assets/javascripts/active_admin/lib/per_page.js.coffee +6 -2
- data/app/assets/javascripts/active_admin/lib/table-checkbox-toggler.js.coffee +3 -5
- data/app/assets/stylesheets/active_admin/_base.scss +2 -2
- data/app/assets/stylesheets/active_admin/_forms.scss +6 -12
- data/app/assets/stylesheets/active_admin/components/_batch_actions.scss +0 -5
- data/app/assets/stylesheets/active_admin/components/_pagination.scss +11 -0
- data/app/assets/stylesheets/active_admin/components/_status_tags.scss +1 -0
- data/app/assets/stylesheets/active_admin/components/_tables.scss +4 -1
- data/app/assets/stylesheets/active_admin/mixins/_all.scss +0 -2
- data/app/assets/stylesheets/active_admin/print.scss +2 -3
- data/app/views/active_admin/devise/sessions/new.html.erb +1 -1
- data/app/views/active_admin/devise/shared/_links.erb +12 -6
- data/app/views/kaminari/active_admin/_first_page.html.erb +11 -0
- data/app/views/kaminari/active_admin/_gap.html.erb +8 -0
- data/app/views/kaminari/active_admin/_last_page.html.erb +11 -0
- data/app/views/kaminari/active_admin/_next_page.html.erb +11 -0
- data/app/views/kaminari/active_admin/_page.html.erb +12 -0
- data/app/views/kaminari/active_admin/_paginator.html.erb +25 -0
- data/app/views/kaminari/active_admin/_prev_page.html.erb +11 -0
- data/codecov.yml +14 -12
- data/config/i18n-tasks.yml +26 -0
- data/config/locales/ar.yml +1 -3
- data/config/locales/bg.yml +0 -2
- data/config/locales/bs.yml +0 -2
- data/config/locales/ca.yml +0 -2
- data/config/locales/cs.yml +0 -2
- data/config/locales/da.yml +1 -3
- data/config/locales/de-CH.yml +1 -3
- data/config/locales/de.yml +1 -3
- data/config/locales/el.yml +1 -3
- data/config/locales/en-CA.yml +138 -0
- data/config/locales/en-GB.yml +43 -3
- data/config/locales/en.yml +8 -4
- data/config/locales/es-MX.yml +3 -2
- data/config/locales/es.yml +10 -4
- data/config/locales/fa.yml +0 -2
- data/config/locales/fi.yml +0 -2
- data/config/locales/fr.yml +9 -2
- data/config/locales/he.yml +53 -7
- data/config/locales/hr.yml +0 -2
- data/config/locales/hu.yml +0 -2
- data/config/locales/id.yml +1 -3
- data/config/locales/it.yml +2 -4
- data/config/locales/ja.yml +1 -3
- data/config/locales/ko.yml +0 -2
- data/config/locales/lt.yml +24 -4
- data/config/locales/lv.yml +0 -2
- data/config/locales/nb.yml +0 -2
- data/config/locales/nl.yml +1 -3
- data/config/locales/pl.yml +3 -2
- data/config/locales/pt-BR.yml +1 -3
- data/config/locales/pt-PT.yml +0 -2
- data/config/locales/ro.yml +0 -2
- data/config/locales/ru.yml +1 -3
- data/config/locales/sk.yml +0 -2
- data/config/locales/sv-SE.yml +1 -3
- data/config/locales/tr.yml +0 -2
- data/config/locales/uk.yml +1 -3
- data/config/locales/vi.yml +0 -2
- data/config/locales/zh-CN.yml +0 -2
- data/config/locales/zh-TW.yml +1 -3
- data/config/mdl_style.rb +9 -0
- data/cucumber.yml +3 -3
- data/docs/0-installation.md +15 -12
- data/docs/1-general-configuration.md +10 -3
- data/docs/10-custom-pages.md +10 -5
- data/docs/11-decorators.md +1 -0
- data/docs/12-arbre-components.md +7 -9
- data/docs/13-authorization-adapter.md +39 -24
- data/docs/14-gotchas.md +41 -22
- data/docs/2-resource-customization.md +41 -18
- data/docs/3-index-pages.md +30 -12
- data/docs/3-index-pages/custom-index.md +1 -0
- data/docs/3-index-pages/index-as-block.md +0 -5
- data/docs/3-index-pages/index-as-blog.md +0 -5
- data/docs/3-index-pages/index-as-grid.md +0 -5
- data/docs/3-index-pages/index-as-table.md +1 -9
- data/docs/4-csv-format.md +2 -1
- data/docs/5-forms.md +45 -21
- data/docs/6-show-pages.md +2 -1
- data/docs/7-sidebars.md +2 -1
- data/docs/8-custom-actions.md +4 -1
- data/docs/9-batch-actions.md +4 -2
- data/docs/documentation.md +19 -21
- data/features/comments/commenting.feature +20 -0
- data/features/index/filters.feature +41 -1
- data/features/index/format_as_csv.feature +17 -0
- data/features/index/index_scopes.feature +15 -0
- data/features/registering_assets.feature +8 -4
- data/features/show/attributes_table_title.feature +54 -0
- data/features/show/tabs.feature +10 -4
- data/features/step_definitions/action_link_steps.rb +0 -1
- data/features/step_definitions/attributes_table_title_steps.rb +11 -0
- data/features/step_definitions/batch_action_steps.rb +2 -2
- data/features/step_definitions/comment_steps.rb +21 -1
- data/features/step_definitions/configuration_steps.rb +1 -1
- data/features/step_definitions/filter_steps.rb +9 -0
- data/features/step_definitions/format_steps.rb +1 -1
- data/features/step_definitions/index_scope_steps.rb +4 -0
- data/features/support/env.rb +5 -4
- data/features/support/regular_env.rb +7 -0
- data/features/support/reload_env.rb +7 -0
- data/gemfiles/rails_42.gemfile +2 -37
- data/gemfiles/rails_50.gemfile +5 -40
- data/gemfiles/rails_51.gemfile +5 -40
- data/lib/active_admin.rb +0 -3
- data/lib/active_admin/application.rb +6 -4
- data/lib/active_admin/asset_registration.rb +8 -0
- data/lib/active_admin/authorization_adapter.rb +0 -3
- data/lib/active_admin/base_controller.rb +1 -2
- data/lib/active_admin/base_controller/authorization.rb +0 -1
- data/lib/active_admin/base_controller/menu.rb +9 -9
- data/lib/active_admin/batch_actions/controller.rb +1 -1
- data/lib/active_admin/batch_actions/views/selection_cells.rb +6 -5
- data/lib/active_admin/csv_builder.rb +3 -3
- data/lib/active_admin/dependency.rb +1 -1
- data/lib/active_admin/devise.rb +2 -2
- data/lib/active_admin/dsl.rb +2 -2
- data/lib/active_admin/filters.rb +2 -0
- data/lib/active_admin/filters/active.rb +13 -14
- data/lib/active_admin/filters/active_filter.rb +87 -0
- data/lib/active_admin/filters/active_sidebar.rb +50 -0
- data/lib/active_admin/filters/forms.rb +1 -2
- data/lib/active_admin/filters/resource_extension.rb +2 -30
- data/lib/active_admin/helpers/settings.rb +0 -1
- data/lib/active_admin/inputs/datepicker_input.rb +5 -5
- data/lib/active_admin/inputs/filters/date_range_input.rb +12 -4
- data/lib/active_admin/inputs/filters/text_input.rb +0 -1
- data/lib/active_admin/menu.rb +4 -4
- data/lib/active_admin/menu_collection.rb +0 -2
- data/lib/active_admin/namespace.rb +1 -1
- data/lib/active_admin/orm/active_record/comments/comment.rb +1 -5
- data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +4 -2
- data/lib/active_admin/page_controller.rb +1 -1
- data/lib/active_admin/resource/action_items.rb +4 -0
- data/lib/active_admin/resource/attributes.rb +1 -1
- data/lib/active_admin/resource/page_presenters.rb +1 -1
- data/lib/active_admin/resource/routes.rb +0 -1
- data/lib/active_admin/resource/scopes.rb +2 -1
- data/lib/active_admin/resource_controller.rb +1 -1
- data/lib/active_admin/resource_controller/data_access.rb +8 -9
- data/lib/active_admin/resource_dsl.rb +10 -10
- data/lib/active_admin/router.rb +1 -1
- data/lib/active_admin/scope.rb +3 -3
- data/lib/active_admin/version.rb +1 -1
- data/lib/active_admin/view_helpers.rb +1 -0
- data/lib/active_admin/view_helpers/display_helper.rb +1 -1
- data/lib/active_admin/view_helpers/form_helper.rb +1 -1
- data/lib/active_admin/view_helpers/scope_name_helper.rb +16 -0
- data/lib/active_admin/views/action_items.rb +1 -1
- data/lib/active_admin/views/components/active_admin_form.rb +1 -1
- data/lib/active_admin/views/components/dropdown_menu.rb +2 -2
- data/lib/active_admin/views/components/index_list.rb +0 -2
- data/lib/active_admin/views/components/paginated_collection.rb +1 -1
- data/lib/active_admin/views/components/scopes.rb +2 -10
- data/lib/active_admin/views/components/status_tag.rb +19 -11
- data/lib/active_admin/views/components/tabs.rb +2 -2
- data/lib/active_admin/views/header.rb +0 -1
- data/lib/active_admin/views/index_as_blog.rb +1 -2
- data/lib/active_admin/views/index_as_grid.rb +2 -2
- data/lib/active_admin/views/index_as_table.rb +19 -1
- data/lib/active_admin/views/pages/base.rb +4 -4
- data/lib/active_admin/views/pages/show.rb +6 -1
- data/lib/active_admin/views/title_bar.rb +4 -4
- data/lib/bug_report_templates/{rails_5_master.rb → active_admin_master.rb} +35 -40
- data/lib/generators/active_admin/devise/devise_generator.rb +1 -1
- data/lib/generators/active_admin/install/templates/admin_user.rb.erb +1 -1
- data/spec/bug_report_templates_spec.rb +2 -3
- data/spec/rails_helper.rb +0 -3
- data/spec/spec_helper.rb +1 -12
- data/spec/support/active_admin_integration_spec_helper.rb +1 -1
- data/spec/support/rails_template.rb +5 -37
- data/spec/support/rails_template_with_data.rb +262 -3
- data/spec/support/templates/policies/active_admin/comment_policy.rb +1 -1
- data/spec/support/templates/policies/active_admin/page_policy.rb +1 -1
- data/spec/support/templates/policies/application_policy.rb +1 -2
- data/spec/support/templates/post_decorator.rb +0 -1
- data/spec/unit/abstract_view_factory_spec.rb +0 -1
- data/spec/unit/application_spec.rb +4 -0
- data/spec/unit/asset_registration_spec.rb +29 -0
- data/spec/unit/belongs_to_spec.rb +1 -2
- data/spec/unit/config_shared_examples.rb +1 -1
- data/spec/unit/csv_builder_spec.rb +2 -4
- data/spec/unit/dependency_spec.rb +7 -7
- data/spec/unit/dsl_spec.rb +0 -2
- data/spec/unit/filters/active_filter_spec.rb +135 -0
- data/spec/unit/filters/active_spec.rb +11 -1
- data/spec/unit/filters/filter_form_builder_spec.rb +9 -7
- data/spec/unit/form_builder_spec.rb +14 -14
- data/spec/unit/helpers/scope_chain_spec.rb +0 -1
- data/spec/unit/i18n_spec.rb +17 -0
- data/spec/unit/menu_item_spec.rb +1 -3
- data/spec/unit/namespace/register_page_spec.rb +1 -1
- data/spec/unit/namespace_spec.rb +0 -1
- data/spec/unit/page_spec.rb +0 -3
- data/spec/unit/resource/action_items_spec.rb +5 -1
- data/spec/unit/resource/attributes_spec.rb +1 -2
- data/spec/unit/resource/ordering_spec.rb +0 -3
- data/spec/unit/resource/scopes_spec.rb +1 -1
- data/spec/unit/resource_controller/data_access_spec.rb +2 -2
- data/spec/unit/resource_controller_spec.rb +1 -2
- data/spec/unit/resource_spec.rb +9 -2
- data/spec/unit/routing_spec.rb +0 -2
- data/spec/unit/scope_spec.rb +3 -3
- data/spec/unit/settings_spec.rb +0 -1
- data/spec/unit/view_factory_spec.rb +1 -1
- data/spec/unit/view_helpers/flash_helper_spec.rb +0 -1
- data/spec/unit/view_helpers/form_helper_spec.rb +3 -4
- data/spec/unit/view_helpers/method_or_proc_helper_spec.rb +0 -1
- data/spec/unit/views/components/attributes_table_spec.rb +0 -1
- data/spec/unit/views/components/columns_spec.rb +0 -2
- data/spec/unit/views/components/site_title_spec.rb +0 -2
- data/spec/unit/views/components/status_tag_spec.rb +23 -7
- data/spec/unit/views/components/tabs_spec.rb +29 -1
- data/spec/unit/views/pages/index_spec.rb +1 -1
- data/tasks/docs.rake +37 -10
- data/tasks/lint.rake +14 -1
- data/tasks/local.rake +2 -2
- data/tasks/test.rake +8 -25
- data/vendor/assets/javascripts/jquery-ui/data.js +41 -0
- data/vendor/assets/javascripts/jquery-ui/disable-selection.js +48 -0
- data/vendor/assets/javascripts/jquery-ui/escape-selector.js +23 -0
- data/vendor/assets/javascripts/jquery-ui/focusable.js +86 -0
- data/vendor/assets/javascripts/jquery-ui/ie.js +17 -0
- data/vendor/assets/javascripts/jquery-ui/keycode.js +47 -0
- data/vendor/assets/javascripts/jquery-ui/plugin.js +46 -0
- data/vendor/assets/javascripts/jquery-ui/position.js +500 -0
- data/vendor/assets/javascripts/jquery-ui/safe-active-element.js +42 -0
- data/vendor/assets/javascripts/jquery-ui/safe-blur.js +23 -0
- data/vendor/assets/javascripts/jquery-ui/scroll-parent.js +47 -0
- data/vendor/assets/javascripts/jquery-ui/tabbable.js +38 -0
- data/vendor/assets/javascripts/jquery-ui/unique-id.js +51 -0
- data/vendor/assets/javascripts/jquery-ui/version.js +17 -0
- data/vendor/assets/javascripts/jquery-ui/widget.js +735 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/button.js +391 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/checkboxradio.js +300 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/controlgroup.js +300 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/datepicker.js +2123 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/dialog.js +954 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/draggable.js +1259 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/mouse.js +230 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/resizable.js +1207 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/sortable.js +1561 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/tabs.js +931 -0
- data/vendor/assets/stylesheets/active_admin/_normalize.scss +447 -0
- metadata +62 -51
- data/.hound.yml +0 -14
- data/Appraisals +0 -41
- data/app/assets/images/active_admin/datepicker/datepicker-input-icon.png +0 -0
- data/app/assets/javascripts/active_admin/jquery_ui.js.erb +0 -18
- data/app/assets/stylesheets/active_admin/mixins/_reset.scss +0 -165
- data/lib/active_admin/filters/humanized.rb +0 -68
- data/spec/requests/javascript_spec.rb +0 -22
- data/spec/support/jslint.yml +0 -80
- data/spec/unit/filters/humanized_spec.rb +0 -64
- data/tasks/yard.rake +0 -9
@@ -0,0 +1,500 @@
|
|
1
|
+
//= require jquery-ui/version
|
2
|
+
|
3
|
+
/*!
|
4
|
+
* jQuery UI Position 1.12.1
|
5
|
+
* http://jqueryui.com
|
6
|
+
*
|
7
|
+
* Copyright jQuery Foundation and other contributors
|
8
|
+
* Released under the MIT license.
|
9
|
+
* http://jquery.org/license
|
10
|
+
*
|
11
|
+
* http://api.jqueryui.com/position/
|
12
|
+
*/
|
13
|
+
|
14
|
+
//>>label: Position
|
15
|
+
//>>group: Core
|
16
|
+
//>>description: Positions elements relative to other elements.
|
17
|
+
//>>docs: http://api.jqueryui.com/position/
|
18
|
+
//>>demos: http://jqueryui.com/position/
|
19
|
+
|
20
|
+
( function( factory ) {
|
21
|
+
if ( typeof define === "function" && define.amd ) {
|
22
|
+
|
23
|
+
// AMD. Register as an anonymous module.
|
24
|
+
define( [ "jquery", "./version" ], factory );
|
25
|
+
} else {
|
26
|
+
|
27
|
+
// Browser globals
|
28
|
+
factory( jQuery );
|
29
|
+
}
|
30
|
+
}( function( $ ) {
|
31
|
+
( function() {
|
32
|
+
var cachedScrollbarWidth,
|
33
|
+
max = Math.max,
|
34
|
+
abs = Math.abs,
|
35
|
+
rhorizontal = /left|center|right/,
|
36
|
+
rvertical = /top|center|bottom/,
|
37
|
+
roffset = /[\+\-]\d+(\.[\d]+)?%?/,
|
38
|
+
rposition = /^\w+/,
|
39
|
+
rpercent = /%$/,
|
40
|
+
_position = $.fn.position;
|
41
|
+
|
42
|
+
function getOffsets( offsets, width, height ) {
|
43
|
+
return [
|
44
|
+
parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
|
45
|
+
parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
|
46
|
+
];
|
47
|
+
}
|
48
|
+
|
49
|
+
function parseCss( element, property ) {
|
50
|
+
return parseInt( $.css( element, property ), 10 ) || 0;
|
51
|
+
}
|
52
|
+
|
53
|
+
function getDimensions( elem ) {
|
54
|
+
var raw = elem[ 0 ];
|
55
|
+
if ( raw.nodeType === 9 ) {
|
56
|
+
return {
|
57
|
+
width: elem.width(),
|
58
|
+
height: elem.height(),
|
59
|
+
offset: { top: 0, left: 0 }
|
60
|
+
};
|
61
|
+
}
|
62
|
+
if ( $.isWindow( raw ) ) {
|
63
|
+
return {
|
64
|
+
width: elem.width(),
|
65
|
+
height: elem.height(),
|
66
|
+
offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
|
67
|
+
};
|
68
|
+
}
|
69
|
+
if ( raw.preventDefault ) {
|
70
|
+
return {
|
71
|
+
width: 0,
|
72
|
+
height: 0,
|
73
|
+
offset: { top: raw.pageY, left: raw.pageX }
|
74
|
+
};
|
75
|
+
}
|
76
|
+
return {
|
77
|
+
width: elem.outerWidth(),
|
78
|
+
height: elem.outerHeight(),
|
79
|
+
offset: elem.offset()
|
80
|
+
};
|
81
|
+
}
|
82
|
+
|
83
|
+
$.position = {
|
84
|
+
scrollbarWidth: function() {
|
85
|
+
if ( cachedScrollbarWidth !== undefined ) {
|
86
|
+
return cachedScrollbarWidth;
|
87
|
+
}
|
88
|
+
var w1, w2,
|
89
|
+
div = $( "<div " +
|
90
|
+
"style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'>" +
|
91
|
+
"<div style='height:100px;width:auto;'></div></div>" ),
|
92
|
+
innerDiv = div.children()[ 0 ];
|
93
|
+
|
94
|
+
$( "body" ).append( div );
|
95
|
+
w1 = innerDiv.offsetWidth;
|
96
|
+
div.css( "overflow", "scroll" );
|
97
|
+
|
98
|
+
w2 = innerDiv.offsetWidth;
|
99
|
+
|
100
|
+
if ( w1 === w2 ) {
|
101
|
+
w2 = div[ 0 ].clientWidth;
|
102
|
+
}
|
103
|
+
|
104
|
+
div.remove();
|
105
|
+
|
106
|
+
return ( cachedScrollbarWidth = w1 - w2 );
|
107
|
+
},
|
108
|
+
getScrollInfo: function( within ) {
|
109
|
+
var overflowX = within.isWindow || within.isDocument ? "" :
|
110
|
+
within.element.css( "overflow-x" ),
|
111
|
+
overflowY = within.isWindow || within.isDocument ? "" :
|
112
|
+
within.element.css( "overflow-y" ),
|
113
|
+
hasOverflowX = overflowX === "scroll" ||
|
114
|
+
( overflowX === "auto" && within.width < within.element[ 0 ].scrollWidth ),
|
115
|
+
hasOverflowY = overflowY === "scroll" ||
|
116
|
+
( overflowY === "auto" && within.height < within.element[ 0 ].scrollHeight );
|
117
|
+
return {
|
118
|
+
width: hasOverflowY ? $.position.scrollbarWidth() : 0,
|
119
|
+
height: hasOverflowX ? $.position.scrollbarWidth() : 0
|
120
|
+
};
|
121
|
+
},
|
122
|
+
getWithinInfo: function( element ) {
|
123
|
+
var withinElement = $( element || window ),
|
124
|
+
isWindow = $.isWindow( withinElement[ 0 ] ),
|
125
|
+
isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9,
|
126
|
+
hasOffset = !isWindow && !isDocument;
|
127
|
+
return {
|
128
|
+
element: withinElement,
|
129
|
+
isWindow: isWindow,
|
130
|
+
isDocument: isDocument,
|
131
|
+
offset: hasOffset ? $( element ).offset() : { left: 0, top: 0 },
|
132
|
+
scrollLeft: withinElement.scrollLeft(),
|
133
|
+
scrollTop: withinElement.scrollTop(),
|
134
|
+
width: withinElement.outerWidth(),
|
135
|
+
height: withinElement.outerHeight()
|
136
|
+
};
|
137
|
+
}
|
138
|
+
};
|
139
|
+
|
140
|
+
$.fn.position = function( options ) {
|
141
|
+
if ( !options || !options.of ) {
|
142
|
+
return _position.apply( this, arguments );
|
143
|
+
}
|
144
|
+
|
145
|
+
// Make a copy, we don't want to modify arguments
|
146
|
+
options = $.extend( {}, options );
|
147
|
+
|
148
|
+
var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
|
149
|
+
target = $( options.of ),
|
150
|
+
within = $.position.getWithinInfo( options.within ),
|
151
|
+
scrollInfo = $.position.getScrollInfo( within ),
|
152
|
+
collision = ( options.collision || "flip" ).split( " " ),
|
153
|
+
offsets = {};
|
154
|
+
|
155
|
+
dimensions = getDimensions( target );
|
156
|
+
if ( target[ 0 ].preventDefault ) {
|
157
|
+
|
158
|
+
// Force left top to allow flipping
|
159
|
+
options.at = "left top";
|
160
|
+
}
|
161
|
+
targetWidth = dimensions.width;
|
162
|
+
targetHeight = dimensions.height;
|
163
|
+
targetOffset = dimensions.offset;
|
164
|
+
|
165
|
+
// Clone to reuse original targetOffset later
|
166
|
+
basePosition = $.extend( {}, targetOffset );
|
167
|
+
|
168
|
+
// Force my and at to have valid horizontal and vertical positions
|
169
|
+
// if a value is missing or invalid, it will be converted to center
|
170
|
+
$.each( [ "my", "at" ], function() {
|
171
|
+
var pos = ( options[ this ] || "" ).split( " " ),
|
172
|
+
horizontalOffset,
|
173
|
+
verticalOffset;
|
174
|
+
|
175
|
+
if ( pos.length === 1 ) {
|
176
|
+
pos = rhorizontal.test( pos[ 0 ] ) ?
|
177
|
+
pos.concat( [ "center" ] ) :
|
178
|
+
rvertical.test( pos[ 0 ] ) ?
|
179
|
+
[ "center" ].concat( pos ) :
|
180
|
+
[ "center", "center" ];
|
181
|
+
}
|
182
|
+
pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
|
183
|
+
pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
|
184
|
+
|
185
|
+
// Calculate offsets
|
186
|
+
horizontalOffset = roffset.exec( pos[ 0 ] );
|
187
|
+
verticalOffset = roffset.exec( pos[ 1 ] );
|
188
|
+
offsets[ this ] = [
|
189
|
+
horizontalOffset ? horizontalOffset[ 0 ] : 0,
|
190
|
+
verticalOffset ? verticalOffset[ 0 ] : 0
|
191
|
+
];
|
192
|
+
|
193
|
+
// Reduce to just the positions without the offsets
|
194
|
+
options[ this ] = [
|
195
|
+
rposition.exec( pos[ 0 ] )[ 0 ],
|
196
|
+
rposition.exec( pos[ 1 ] )[ 0 ]
|
197
|
+
];
|
198
|
+
} );
|
199
|
+
|
200
|
+
// Normalize collision option
|
201
|
+
if ( collision.length === 1 ) {
|
202
|
+
collision[ 1 ] = collision[ 0 ];
|
203
|
+
}
|
204
|
+
|
205
|
+
if ( options.at[ 0 ] === "right" ) {
|
206
|
+
basePosition.left += targetWidth;
|
207
|
+
} else if ( options.at[ 0 ] === "center" ) {
|
208
|
+
basePosition.left += targetWidth / 2;
|
209
|
+
}
|
210
|
+
|
211
|
+
if ( options.at[ 1 ] === "bottom" ) {
|
212
|
+
basePosition.top += targetHeight;
|
213
|
+
} else if ( options.at[ 1 ] === "center" ) {
|
214
|
+
basePosition.top += targetHeight / 2;
|
215
|
+
}
|
216
|
+
|
217
|
+
atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
|
218
|
+
basePosition.left += atOffset[ 0 ];
|
219
|
+
basePosition.top += atOffset[ 1 ];
|
220
|
+
|
221
|
+
return this.each( function() {
|
222
|
+
var collisionPosition, using,
|
223
|
+
elem = $( this ),
|
224
|
+
elemWidth = elem.outerWidth(),
|
225
|
+
elemHeight = elem.outerHeight(),
|
226
|
+
marginLeft = parseCss( this, "marginLeft" ),
|
227
|
+
marginTop = parseCss( this, "marginTop" ),
|
228
|
+
collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) +
|
229
|
+
scrollInfo.width,
|
230
|
+
collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) +
|
231
|
+
scrollInfo.height,
|
232
|
+
position = $.extend( {}, basePosition ),
|
233
|
+
myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
|
234
|
+
|
235
|
+
if ( options.my[ 0 ] === "right" ) {
|
236
|
+
position.left -= elemWidth;
|
237
|
+
} else if ( options.my[ 0 ] === "center" ) {
|
238
|
+
position.left -= elemWidth / 2;
|
239
|
+
}
|
240
|
+
|
241
|
+
if ( options.my[ 1 ] === "bottom" ) {
|
242
|
+
position.top -= elemHeight;
|
243
|
+
} else if ( options.my[ 1 ] === "center" ) {
|
244
|
+
position.top -= elemHeight / 2;
|
245
|
+
}
|
246
|
+
|
247
|
+
position.left += myOffset[ 0 ];
|
248
|
+
position.top += myOffset[ 1 ];
|
249
|
+
|
250
|
+
collisionPosition = {
|
251
|
+
marginLeft: marginLeft,
|
252
|
+
marginTop: marginTop
|
253
|
+
};
|
254
|
+
|
255
|
+
$.each( [ "left", "top" ], function( i, dir ) {
|
256
|
+
if ( $.ui.position[ collision[ i ] ] ) {
|
257
|
+
$.ui.position[ collision[ i ] ][ dir ]( position, {
|
258
|
+
targetWidth: targetWidth,
|
259
|
+
targetHeight: targetHeight,
|
260
|
+
elemWidth: elemWidth,
|
261
|
+
elemHeight: elemHeight,
|
262
|
+
collisionPosition: collisionPosition,
|
263
|
+
collisionWidth: collisionWidth,
|
264
|
+
collisionHeight: collisionHeight,
|
265
|
+
offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
|
266
|
+
my: options.my,
|
267
|
+
at: options.at,
|
268
|
+
within: within,
|
269
|
+
elem: elem
|
270
|
+
} );
|
271
|
+
}
|
272
|
+
} );
|
273
|
+
|
274
|
+
if ( options.using ) {
|
275
|
+
|
276
|
+
// Adds feedback as second argument to using callback, if present
|
277
|
+
using = function( props ) {
|
278
|
+
var left = targetOffset.left - position.left,
|
279
|
+
right = left + targetWidth - elemWidth,
|
280
|
+
top = targetOffset.top - position.top,
|
281
|
+
bottom = top + targetHeight - elemHeight,
|
282
|
+
feedback = {
|
283
|
+
target: {
|
284
|
+
element: target,
|
285
|
+
left: targetOffset.left,
|
286
|
+
top: targetOffset.top,
|
287
|
+
width: targetWidth,
|
288
|
+
height: targetHeight
|
289
|
+
},
|
290
|
+
element: {
|
291
|
+
element: elem,
|
292
|
+
left: position.left,
|
293
|
+
top: position.top,
|
294
|
+
width: elemWidth,
|
295
|
+
height: elemHeight
|
296
|
+
},
|
297
|
+
horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
|
298
|
+
vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
|
299
|
+
};
|
300
|
+
if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
|
301
|
+
feedback.horizontal = "center";
|
302
|
+
}
|
303
|
+
if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
|
304
|
+
feedback.vertical = "middle";
|
305
|
+
}
|
306
|
+
if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
|
307
|
+
feedback.important = "horizontal";
|
308
|
+
} else {
|
309
|
+
feedback.important = "vertical";
|
310
|
+
}
|
311
|
+
options.using.call( this, props, feedback );
|
312
|
+
};
|
313
|
+
}
|
314
|
+
|
315
|
+
elem.offset( $.extend( position, { using: using } ) );
|
316
|
+
} );
|
317
|
+
};
|
318
|
+
|
319
|
+
$.ui.position = {
|
320
|
+
fit: {
|
321
|
+
left: function( position, data ) {
|
322
|
+
var within = data.within,
|
323
|
+
withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
|
324
|
+
outerWidth = within.width,
|
325
|
+
collisionPosLeft = position.left - data.collisionPosition.marginLeft,
|
326
|
+
overLeft = withinOffset - collisionPosLeft,
|
327
|
+
overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
|
328
|
+
newOverRight;
|
329
|
+
|
330
|
+
// Element is wider than within
|
331
|
+
if ( data.collisionWidth > outerWidth ) {
|
332
|
+
|
333
|
+
// Element is initially over the left side of within
|
334
|
+
if ( overLeft > 0 && overRight <= 0 ) {
|
335
|
+
newOverRight = position.left + overLeft + data.collisionWidth - outerWidth -
|
336
|
+
withinOffset;
|
337
|
+
position.left += overLeft - newOverRight;
|
338
|
+
|
339
|
+
// Element is initially over right side of within
|
340
|
+
} else if ( overRight > 0 && overLeft <= 0 ) {
|
341
|
+
position.left = withinOffset;
|
342
|
+
|
343
|
+
// Element is initially over both left and right sides of within
|
344
|
+
} else {
|
345
|
+
if ( overLeft > overRight ) {
|
346
|
+
position.left = withinOffset + outerWidth - data.collisionWidth;
|
347
|
+
} else {
|
348
|
+
position.left = withinOffset;
|
349
|
+
}
|
350
|
+
}
|
351
|
+
|
352
|
+
// Too far left -> align with left edge
|
353
|
+
} else if ( overLeft > 0 ) {
|
354
|
+
position.left += overLeft;
|
355
|
+
|
356
|
+
// Too far right -> align with right edge
|
357
|
+
} else if ( overRight > 0 ) {
|
358
|
+
position.left -= overRight;
|
359
|
+
|
360
|
+
// Adjust based on position and margin
|
361
|
+
} else {
|
362
|
+
position.left = max( position.left - collisionPosLeft, position.left );
|
363
|
+
}
|
364
|
+
},
|
365
|
+
top: function( position, data ) {
|
366
|
+
var within = data.within,
|
367
|
+
withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
|
368
|
+
outerHeight = data.within.height,
|
369
|
+
collisionPosTop = position.top - data.collisionPosition.marginTop,
|
370
|
+
overTop = withinOffset - collisionPosTop,
|
371
|
+
overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
|
372
|
+
newOverBottom;
|
373
|
+
|
374
|
+
// Element is taller than within
|
375
|
+
if ( data.collisionHeight > outerHeight ) {
|
376
|
+
|
377
|
+
// Element is initially over the top of within
|
378
|
+
if ( overTop > 0 && overBottom <= 0 ) {
|
379
|
+
newOverBottom = position.top + overTop + data.collisionHeight - outerHeight -
|
380
|
+
withinOffset;
|
381
|
+
position.top += overTop - newOverBottom;
|
382
|
+
|
383
|
+
// Element is initially over bottom of within
|
384
|
+
} else if ( overBottom > 0 && overTop <= 0 ) {
|
385
|
+
position.top = withinOffset;
|
386
|
+
|
387
|
+
// Element is initially over both top and bottom of within
|
388
|
+
} else {
|
389
|
+
if ( overTop > overBottom ) {
|
390
|
+
position.top = withinOffset + outerHeight - data.collisionHeight;
|
391
|
+
} else {
|
392
|
+
position.top = withinOffset;
|
393
|
+
}
|
394
|
+
}
|
395
|
+
|
396
|
+
// Too far up -> align with top
|
397
|
+
} else if ( overTop > 0 ) {
|
398
|
+
position.top += overTop;
|
399
|
+
|
400
|
+
// Too far down -> align with bottom edge
|
401
|
+
} else if ( overBottom > 0 ) {
|
402
|
+
position.top -= overBottom;
|
403
|
+
|
404
|
+
// Adjust based on position and margin
|
405
|
+
} else {
|
406
|
+
position.top = max( position.top - collisionPosTop, position.top );
|
407
|
+
}
|
408
|
+
}
|
409
|
+
},
|
410
|
+
flip: {
|
411
|
+
left: function( position, data ) {
|
412
|
+
var within = data.within,
|
413
|
+
withinOffset = within.offset.left + within.scrollLeft,
|
414
|
+
outerWidth = within.width,
|
415
|
+
offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
|
416
|
+
collisionPosLeft = position.left - data.collisionPosition.marginLeft,
|
417
|
+
overLeft = collisionPosLeft - offsetLeft,
|
418
|
+
overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
|
419
|
+
myOffset = data.my[ 0 ] === "left" ?
|
420
|
+
-data.elemWidth :
|
421
|
+
data.my[ 0 ] === "right" ?
|
422
|
+
data.elemWidth :
|
423
|
+
0,
|
424
|
+
atOffset = data.at[ 0 ] === "left" ?
|
425
|
+
data.targetWidth :
|
426
|
+
data.at[ 0 ] === "right" ?
|
427
|
+
-data.targetWidth :
|
428
|
+
0,
|
429
|
+
offset = -2 * data.offset[ 0 ],
|
430
|
+
newOverRight,
|
431
|
+
newOverLeft;
|
432
|
+
|
433
|
+
if ( overLeft < 0 ) {
|
434
|
+
newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth -
|
435
|
+
outerWidth - withinOffset;
|
436
|
+
if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
|
437
|
+
position.left += myOffset + atOffset + offset;
|
438
|
+
}
|
439
|
+
} else if ( overRight > 0 ) {
|
440
|
+
newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset +
|
441
|
+
atOffset + offset - offsetLeft;
|
442
|
+
if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
|
443
|
+
position.left += myOffset + atOffset + offset;
|
444
|
+
}
|
445
|
+
}
|
446
|
+
},
|
447
|
+
top: function( position, data ) {
|
448
|
+
var within = data.within,
|
449
|
+
withinOffset = within.offset.top + within.scrollTop,
|
450
|
+
outerHeight = within.height,
|
451
|
+
offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
|
452
|
+
collisionPosTop = position.top - data.collisionPosition.marginTop,
|
453
|
+
overTop = collisionPosTop - offsetTop,
|
454
|
+
overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
|
455
|
+
top = data.my[ 1 ] === "top",
|
456
|
+
myOffset = top ?
|
457
|
+
-data.elemHeight :
|
458
|
+
data.my[ 1 ] === "bottom" ?
|
459
|
+
data.elemHeight :
|
460
|
+
0,
|
461
|
+
atOffset = data.at[ 1 ] === "top" ?
|
462
|
+
data.targetHeight :
|
463
|
+
data.at[ 1 ] === "bottom" ?
|
464
|
+
-data.targetHeight :
|
465
|
+
0,
|
466
|
+
offset = -2 * data.offset[ 1 ],
|
467
|
+
newOverTop,
|
468
|
+
newOverBottom;
|
469
|
+
if ( overTop < 0 ) {
|
470
|
+
newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight -
|
471
|
+
outerHeight - withinOffset;
|
472
|
+
if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) {
|
473
|
+
position.top += myOffset + atOffset + offset;
|
474
|
+
}
|
475
|
+
} else if ( overBottom > 0 ) {
|
476
|
+
newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset +
|
477
|
+
offset - offsetTop;
|
478
|
+
if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) {
|
479
|
+
position.top += myOffset + atOffset + offset;
|
480
|
+
}
|
481
|
+
}
|
482
|
+
}
|
483
|
+
},
|
484
|
+
flipfit: {
|
485
|
+
left: function() {
|
486
|
+
$.ui.position.flip.left.apply( this, arguments );
|
487
|
+
$.ui.position.fit.left.apply( this, arguments );
|
488
|
+
},
|
489
|
+
top: function() {
|
490
|
+
$.ui.position.flip.top.apply( this, arguments );
|
491
|
+
$.ui.position.fit.top.apply( this, arguments );
|
492
|
+
}
|
493
|
+
}
|
494
|
+
};
|
495
|
+
|
496
|
+
} )();
|
497
|
+
|
498
|
+
return $.ui.position;
|
499
|
+
|
500
|
+
} ) );
|