active_scaffold 3.3.3 → 3.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (198) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +39 -0
  3. data/README.md +5 -3
  4. data/app/assets/images/active_scaffold/refresh.png +0 -0
  5. data/app/assets/javascripts/jquery/active_scaffold.js +182 -91
  6. data/app/assets/javascripts/jquery/date_picker_bridge.js.erb +14 -16
  7. data/app/assets/javascripts/jquery/draggable_lists.js +33 -26
  8. data/app/assets/javascripts/jquery/jquery.editinplace.js +3 -3
  9. data/app/assets/javascripts/prototype/active_scaffold.js +61 -19
  10. data/app/assets/stylesheets/active_scaffold_colors.css.scss +4 -0
  11. data/app/assets/stylesheets/active_scaffold_images.css.scss +3 -0
  12. data/app/assets/stylesheets/active_scaffold_layout.css +23 -2
  13. data/app/views/active_scaffold_overrides/_add_existing_form.html.erb +1 -3
  14. data/app/views/active_scaffold_overrides/_base_form.html.erb +7 -5
  15. data/app/views/active_scaffold_overrides/_field_search.html.erb +1 -2
  16. data/app/views/active_scaffold_overrides/_form.html.erb +6 -4
  17. data/app/views/active_scaffold_overrides/_form_association.html.erb +4 -3
  18. data/app/views/active_scaffold_overrides/_form_association_footer.html.erb +5 -5
  19. data/app/views/active_scaffold_overrides/_form_association_record.html.erb +8 -6
  20. data/app/views/active_scaffold_overrides/_horizontal_subform_header.html.erb +3 -2
  21. data/app/views/active_scaffold_overrides/_list.html.erb +8 -6
  22. data/app/views/active_scaffold_overrides/_list_column_headings.html.erb +1 -4
  23. data/app/views/active_scaffold_overrides/_list_pagination.html.erb +4 -4
  24. data/app/views/active_scaffold_overrides/_list_pagination_links.html.erb +1 -1
  25. data/app/views/active_scaffold_overrides/_list_record.html.erb +3 -3
  26. data/app/views/active_scaffold_overrides/_refresh_list.js.erb +8 -1
  27. data/app/views/active_scaffold_overrides/_search.html.erb +7 -13
  28. data/app/views/active_scaffold_overrides/_show_columns.html.erb +1 -1
  29. data/app/views/active_scaffold_overrides/on_create.js.erb +4 -4
  30. data/app/views/active_scaffold_overrides/render_field_inplace.html.erb +1 -1
  31. data/app/views/active_scaffold_overrides/row.js.erb +1 -1
  32. data/config/locales/de.yml +106 -95
  33. data/config/locales/en.yml +108 -97
  34. data/config/locales/es.yml +109 -98
  35. data/config/locales/fr.yml +108 -97
  36. data/config/locales/hu.yml +109 -98
  37. data/config/locales/ja.yml +100 -89
  38. data/config/locales/ru.yml +115 -104
  39. data/lib/active_scaffold.rb +18 -294
  40. data/lib/active_scaffold/actions/common_search.rb +50 -17
  41. data/lib/active_scaffold/actions/core.rb +93 -22
  42. data/lib/active_scaffold/actions/create.rb +15 -6
  43. data/lib/active_scaffold/actions/field_search.rb +68 -60
  44. data/lib/active_scaffold/actions/list.rb +49 -28
  45. data/lib/active_scaffold/actions/nested.rb +14 -6
  46. data/lib/active_scaffold/actions/search.rb +36 -35
  47. data/lib/active_scaffold/actions/show.rb +9 -4
  48. data/lib/active_scaffold/actions/subform.rb +1 -1
  49. data/lib/active_scaffold/actions/update.rb +22 -7
  50. data/lib/active_scaffold/active_record_permissions.rb +125 -118
  51. data/lib/active_scaffold/attribute_params.rb +84 -66
  52. data/lib/active_scaffold/bridges.rb +3 -3
  53. data/lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb +10 -5
  54. data/lib/active_scaffold/bridges/cancan.rb +2 -1
  55. data/lib/active_scaffold/bridges/cancan/cancan_bridge.rb +13 -2
  56. data/lib/active_scaffold/bridges/carrierwave/form_ui.rb +11 -6
  57. data/lib/active_scaffold/bridges/chosen/helpers.rb +2 -2
  58. data/lib/active_scaffold/bridges/country_helper/country_helper_bridge.rb +45 -29
  59. data/lib/active_scaffold/bridges/date_picker/ext.rb +11 -6
  60. data/lib/active_scaffold/bridges/date_picker/helper.rb +5 -1
  61. data/lib/active_scaffold/bridges/dragonfly/form_ui.rb +10 -5
  62. data/lib/active_scaffold/bridges/dragonfly/list_ui.rb +6 -1
  63. data/lib/active_scaffold/bridges/file_column/form_ui.rb +12 -11
  64. data/lib/active_scaffold/bridges/paperclip/form_ui.rb +14 -6
  65. data/lib/active_scaffold/bridges/paperclip/list_ui.rb +1 -1
  66. data/lib/active_scaffold/bridges/record_select/helpers.rb +15 -12
  67. data/lib/active_scaffold/bridges/shared/date_bridge.rb +7 -8
  68. data/lib/active_scaffold/bridges/tiny_mce.rb +5 -3
  69. data/lib/active_scaffold/bridges/tiny_mce/helpers.rb +4 -5
  70. data/lib/active_scaffold/config/base.rb +4 -0
  71. data/lib/active_scaffold/config/core.rb +12 -5
  72. data/lib/active_scaffold/config/delete.rb +0 -2
  73. data/lib/active_scaffold/config/field_search.rb +1 -4
  74. data/lib/active_scaffold/config/form.rb +0 -2
  75. data/lib/active_scaffold/config/list.rb +31 -1
  76. data/lib/active_scaffold/config/search.rb +0 -3
  77. data/lib/active_scaffold/config/show.rb +0 -6
  78. data/lib/active_scaffold/config/subform.rb +1 -0
  79. data/lib/active_scaffold/configurable.rb +2 -2
  80. data/lib/active_scaffold/constraints.rb +11 -14
  81. data/lib/active_scaffold/core.rb +277 -0
  82. data/lib/active_scaffold/data_structures/action_columns.rb +18 -2
  83. data/lib/active_scaffold/data_structures/action_link.rb +25 -6
  84. data/lib/active_scaffold/data_structures/action_links.rb +9 -4
  85. data/lib/active_scaffold/data_structures/actions.rb +1 -1
  86. data/lib/active_scaffold/data_structures/column.rb +6 -6
  87. data/lib/active_scaffold/data_structures/columns.rb +2 -2
  88. data/lib/active_scaffold/data_structures/nested_info.rb +5 -1
  89. data/lib/active_scaffold/data_structures/sorting.rb +15 -5
  90. data/lib/active_scaffold/delayed_setup.rb +30 -0
  91. data/lib/active_scaffold/engine.rb +25 -0
  92. data/lib/active_scaffold/extensions/action_view_rendering.rb +1 -1
  93. data/lib/active_scaffold/extensions/left_outer_joins.rb +61 -21
  94. data/lib/active_scaffold/extensions/localize.rb +1 -1
  95. data/lib/active_scaffold/extensions/name_option_for_datetime.rb +13 -8
  96. data/lib/active_scaffold/extensions/paginator_extensions.rb +5 -1
  97. data/lib/active_scaffold/extensions/reverse_associations.rb +1 -0
  98. data/lib/active_scaffold/extensions/routing_mapper.rb +1 -1
  99. data/lib/active_scaffold/extensions/unsaved_record.rb +4 -6
  100. data/lib/active_scaffold/finder.rb +79 -27
  101. data/lib/active_scaffold/helpers/association_helpers.rb +48 -18
  102. data/lib/active_scaffold/helpers/controller_helpers.rb +19 -10
  103. data/lib/active_scaffold/helpers/form_column_helpers.rb +185 -87
  104. data/lib/active_scaffold/helpers/human_condition_helpers.rb +2 -1
  105. data/lib/active_scaffold/helpers/id_helpers.rb +14 -8
  106. data/lib/active_scaffold/helpers/list_column_helpers.rb +65 -56
  107. data/lib/active_scaffold/helpers/pagination_helpers.rb +5 -1
  108. data/lib/active_scaffold/helpers/search_column_helpers.rb +21 -18
  109. data/lib/active_scaffold/helpers/view_helpers.rb +102 -64
  110. data/lib/active_scaffold/responds_to_parent.rb +39 -64
  111. data/lib/active_scaffold/tableless.rb +129 -10
  112. data/lib/active_scaffold/version.rb +2 -2
  113. data/test/bridges/bridge_test.rb +1 -1
  114. data/test/bridges/date_picker_test.rb +2 -2
  115. data/test/bridges/paperclip_test.rb +10 -8
  116. data/test/bridges/tiny_mce_test.rb +2 -2
  117. data/test/company.rb +22 -10
  118. data/test/config/base_test.rb +1 -1
  119. data/test/config/core_test.rb +8 -6
  120. data/test/config/create_test.rb +6 -6
  121. data/test/config/delete_test.rb +4 -4
  122. data/test/config/field_search_test.rb +6 -6
  123. data/test/config/list_test.rb +7 -7
  124. data/test/config/nested_test.rb +8 -7
  125. data/test/config/search_test.rb +7 -7
  126. data/test/config/show_test.rb +5 -5
  127. data/test/config/subform_test.rb +1 -1
  128. data/test/config/update_test.rb +5 -4
  129. data/test/data_structures/action_columns_test.rb +15 -16
  130. data/test/data_structures/action_link_test.rb +10 -10
  131. data/test/data_structures/action_links_test.rb +6 -6
  132. data/test/data_structures/actions_test.rb +4 -4
  133. data/test/data_structures/association_column_test.rb +4 -4
  134. data/test/data_structures/column_test.rb +9 -9
  135. data/test/data_structures/columns_test.rb +7 -7
  136. data/test/data_structures/error_message_test.rb +2 -4
  137. data/test/data_structures/set_test.rb +13 -13
  138. data/test/data_structures/sorting_test.rb +8 -8
  139. data/test/data_structures/standard_column_test.rb +2 -2
  140. data/test/data_structures/validation_reflection_test.rb +8 -8
  141. data/test/data_structures/virtual_column_test.rb +5 -5
  142. data/test/extensions/active_record_test.rb +1 -1
  143. data/test/helpers/form_column_helpers_test.rb +5 -5
  144. data/test/helpers/list_column_helpers_test.rb +2 -1
  145. data/test/helpers/pagination_helpers_test.rb +1 -1
  146. data/test/misc/active_record_permissions_test.rb +23 -4
  147. data/test/misc/attribute_params_test.rb +304 -136
  148. data/test/misc/calculation_test.rb +55 -0
  149. data/test/misc/configurable_test.rb +22 -21
  150. data/test/misc/constraints_test.rb +10 -7
  151. data/test/misc/convert_numbers_format_test.rb +149 -0
  152. data/test/misc/finder_test.rb +17 -13
  153. data/test/misc/lang_test.rb +1 -1
  154. data/test/misc/tableless_test.rb +18 -0
  155. data/test/mock_app/app/controllers/addresses_controller.rb +4 -0
  156. data/test/mock_app/app/controllers/buildings_controller.rb +4 -0
  157. data/test/mock_app/app/controllers/cars_controller.rb +4 -0
  158. data/test/mock_app/app/controllers/contacts_controller.rb +4 -0
  159. data/test/mock_app/app/controllers/floors_controller.rb +6 -0
  160. data/test/mock_app/app/controllers/people_controller.rb +4 -0
  161. data/test/mock_app/app/models/address.rb +3 -0
  162. data/test/mock_app/app/models/building.rb +8 -0
  163. data/test/mock_app/app/models/car.rb +3 -0
  164. data/test/mock_app/app/models/contact.rb +3 -0
  165. data/test/mock_app/app/models/file_model.rb +19 -0
  166. data/test/mock_app/app/models/floor.rb +8 -0
  167. data/test/mock_app/app/models/person.rb +11 -0
  168. data/test/mock_app/config/application.rb +2 -0
  169. data/test/mock_app/config/environments/test.rb +1 -1
  170. data/test/mock_app/config/initializers/secret_token.rb +5 -1
  171. data/test/mock_app/config/routes.rb +1 -1
  172. data/test/mock_app/db/schema.rb +51 -0
  173. data/test/model_stub.rb +3 -3
  174. data/test/test_helper.rb +15 -12
  175. metadata +51 -50
  176. data/lib/active_scaffold/extensions/array.rb +0 -7
  177. data/lib/active_scaffold/extensions/cache_association.rb +0 -16
  178. data/lib/active_scaffold/extensions/usa_state.rb +0 -46
  179. data/lib/active_scaffold_env.rb +0 -13
  180. data/test/extensions/array_test.rb +0 -12
  181. data/test/mock_app/public/blank.html +0 -33
  182. data/test/mock_app/public/images/active_scaffold/DO_NOT_EDIT +0 -2
  183. data/test/mock_app/public/images/active_scaffold/default/add.gif +0 -0
  184. data/test/mock_app/public/images/active_scaffold/default/arrow_down.gif +0 -0
  185. data/test/mock_app/public/images/active_scaffold/default/arrow_up.gif +0 -0
  186. data/test/mock_app/public/images/active_scaffold/default/close.gif +0 -0
  187. data/test/mock_app/public/images/active_scaffold/default/cross.png +0 -0
  188. data/test/mock_app/public/images/active_scaffold/default/indicator-small.gif +0 -0
  189. data/test/mock_app/public/images/active_scaffold/default/indicator.gif +0 -0
  190. data/test/mock_app/public/images/active_scaffold/default/magnifier.png +0 -0
  191. data/test/mock_app/public/javascripts/active_scaffold/DO_NOT_EDIT +0 -2
  192. data/test/mock_app/public/javascripts/active_scaffold/default/active_scaffold.js +0 -532
  193. data/test/mock_app/public/javascripts/active_scaffold/default/dhtml_history.js +0 -867
  194. data/test/mock_app/public/javascripts/active_scaffold/default/form_enhancements.js +0 -117
  195. data/test/mock_app/public/javascripts/active_scaffold/default/rico_corner.js +0 -370
  196. data/test/mock_app/public/stylesheets/active_scaffold/DO_NOT_EDIT +0 -2
  197. data/test/mock_app/public/stylesheets/active_scaffold/default/stylesheet-ie.css +0 -35
  198. data/test/mock_app/public/stylesheets/active_scaffold/default/stylesheet.css +0 -848
@@ -1,117 +0,0 @@
1
-
2
- // TODO Change to dropping the name property off the input element when in example mode
3
- TextFieldWithExample = Class.create();
4
- TextFieldWithExample.prototype = {
5
- initialize: function(inputElementId, defaultText, options) {
6
- this.setOptions(options);
7
-
8
- this.input = $(inputElementId);
9
- this.name = this.input.name;
10
- this.defaultText = defaultText;
11
- this.createHiddenInput();
12
-
13
- if (options.focus) this.input.focus();
14
- this.checkAndShowExample();
15
- if (options.focus) {
16
- this.input.selectionStart = 0;
17
- this.input.selectionEnd = 0;
18
- }
19
-
20
- Event.observe(this.input, "blur", this.onBlur.bindAsEventListener(this));
21
- Event.observe(this.input, "focus", this.onFocus.bindAsEventListener(this));
22
- Event.observe(this.input, "select", this.onFocus.bindAsEventListener(this));
23
- Event.observe(this.input, "keydown", this.onKeyPress.bindAsEventListener(this));
24
- Event.observe(this.input, "click", this.onClick.bindAsEventListener(this));
25
- },
26
- createHiddenInput: function() {
27
- this.hiddenInput = document.createElement("input");
28
- this.hiddenInput.type = "hidden";
29
- this.hiddenInput.value = "";
30
- this.input.parentNode.appendChild(this.hiddenInput);
31
- },
32
- setOptions: function(options) {
33
- this.options = { exampleClassName: 'example' };
34
- Object.extend(this.options, options || {});
35
- },
36
- onKeyPress: function(event) {
37
- if (!event) var event = window.event;
38
- var code = (event.which) ? event.which : event.keyCode
39
- if (this.isAlphanumeric(code)) {
40
- this.removeExample();
41
- }
42
- },
43
- onBlur: function(event) {
44
- this.checkAndShowExample();
45
- },
46
- onFocus: function(event) {
47
- this.removeExample();
48
- },
49
- onClick: function(event) {
50
- this.removeExample();
51
- },
52
- isAlphanumeric: function(keyCode) {
53
- return keyCode >= 40 && keyCode <= 90;
54
- },
55
- checkAndShowExample: function() {
56
- if (this.input.value == '') {
57
- this.input.value = this.defaultText;
58
- this.input.name = null;
59
- this.hiddenInput.name = this.name;
60
- Element.addClassName(this.input, this.options.exampleClassName);
61
- }
62
- },
63
- removeExample: function() {
64
- if (this.exampleShown()) {
65
- this.input.value = '';
66
- this.input.name = this.name;
67
- this.hiddenInput.name = null;
68
- Element.removeClassName(this.input, this.options.exampleClassName);
69
- }
70
- },
71
- exampleShown: function() {
72
- return Element.hasClassName(this.input, this.options.exampleClassName);
73
- }
74
- }
75
-
76
- Form.disable = function(form) {
77
- var elements = this.getElements(form);
78
- for (var i = 0; i < elements.length; i++) {
79
- var element = elements[i];
80
- try { element.blur(); } catch (e) {}
81
- element.disabled = 'disabled';
82
- Element.addClassName(element, 'disabled');
83
- }
84
- }
85
- Form.enable = function(form) {
86
- var elements = this.getElements(form);
87
- for (var i = 0; i < elements.length; i++) {
88
- var element = elements[i];
89
- element.disabled = '';
90
- Element.removeClassName(element, 'disabled');
91
- }
92
- }
93
-
94
- DraggableLists = Class.create({
95
- initialize: function(list) {
96
- list = $(list).addClassName('draggable-list');
97
- var list_selected = list.cloneNode(false).addClassName('selected');
98
- list_selected.id += '_seleted';
99
- list.select('input[type=checkbox]').each(function(item) {
100
- var li = item.up('li');
101
- li.down('label').htmlFor = null;
102
- new Draggable(li, {revert: 'failure', ghosting: true});
103
- if (item.checked) list_selected.insert(li.remove());
104
- });
105
- list.insert({after: list_selected});
106
- Droppables.add(list, {hoverclass: 'hover', containment: list_selected.id, onDrop: this.drop_to_list});
107
- Droppables.add(list_selected, {hoverclass: 'hover', containment: list.id, onDrop: this.drop_to_list});
108
- list.undoPositioned(); // undo positioned to fix dragging from elements with overflow auto
109
- list_selected.undoPositioned();
110
- },
111
-
112
- drop_to_list: function(draggable, droppable, event) {
113
- droppable.insert(draggable.remove());
114
- draggable.setStyle({left: '0px', top: '0px'});
115
- draggable.down('input').checked = droppable.hasClassName('selected');
116
- }
117
- });
@@ -1,370 +0,0 @@
1
- /**
2
- *
3
- * Copyright 2005 Sabre Airline Solutions
4
- *
5
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
6
- * file except in compliance with the License. You may obtain a copy of the License at
7
- *
8
- * http://www.apache.org/licenses/LICENSE-2.0
9
- *
10
- * Unless required by applicable law or agreed to in writing, software distributed under the
11
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
12
- * either express or implied. See the License for the specific language governing permissions
13
- * and limitations under the License.
14
- **/
15
-
16
-
17
- //-------------------- rico.js
18
- var Rico = {
19
- Version: '1.1.0',
20
- prototypeVersion: parseFloat(Prototype.Version.split(".")[0] + "." + Prototype.Version.split(".")[1])
21
- }
22
-
23
- //-------------------- ricoColor.js
24
- Rico.Color = Class.create();
25
-
26
- Rico.Color.prototype = {
27
-
28
- initialize: function(red, green, blue) {
29
- this.rgb = { r: red, g : green, b : blue };
30
- },
31
-
32
- blend: function(other) {
33
- this.rgb.r = Math.floor((this.rgb.r + other.rgb.r)/2);
34
- this.rgb.g = Math.floor((this.rgb.g + other.rgb.g)/2);
35
- this.rgb.b = Math.floor((this.rgb.b + other.rgb.b)/2);
36
- },
37
-
38
- asRGB: function() {
39
- return "rgb(" + this.rgb.r + "," + this.rgb.g + "," + this.rgb.b + ")";
40
- },
41
-
42
- asHex: function() {
43
- return "#" + this.rgb.r.toColorPart() + this.rgb.g.toColorPart() + this.rgb.b.toColorPart();
44
- },
45
-
46
- asHSB: function() {
47
- return Rico.Color.RGBtoHSB(this.rgb.r, this.rgb.g, this.rgb.b);
48
- },
49
-
50
- toString: function() {
51
- return this.asHex();
52
- }
53
-
54
- };
55
-
56
- Rico.Color.createFromHex = function(hexCode) {
57
- if(hexCode.length==4) {
58
- var shortHexCode = hexCode;
59
- var hexCode = '#';
60
- for(var i=1;i<4;i++) hexCode += (shortHexCode.charAt(i) + shortHexCode.charAt(i));
61
- }
62
- if ( hexCode.indexOf('#') == 0 )
63
- hexCode = hexCode.substring(1);
64
- var red = hexCode.substring(0,2);
65
- var green = hexCode.substring(2,4);
66
- var blue = hexCode.substring(4,6);
67
- return new Rico.Color( parseInt(red,16), parseInt(green,16), parseInt(blue,16) );
68
- }
69
-
70
- /**
71
- * Factory method for creating a color from the background of
72
- * an HTML element.
73
- */
74
- Rico.Color.createColorFromBackground = function(elem) {
75
-
76
- //var actualColor = RicoUtil.getElementsComputedStyle($(elem), "backgroundColor", "background-color"); // Changed to prototype style
77
- var actualColor = $(elem).getStyle('backgroundColor');
78
-
79
- if ( actualColor == "transparent" && elem.parentNode )
80
- return Rico.Color.createColorFromBackground(elem.parentNode);
81
-
82
- if ( actualColor == null )
83
- return new Rico.Color(255,255,255);
84
-
85
- if ( actualColor.indexOf("rgb(") == 0 ) {
86
- var colors = actualColor.substring(4, actualColor.length - 1 );
87
- var colorArray = colors.split(",");
88
- return new Rico.Color( parseInt( colorArray[0] ),
89
- parseInt( colorArray[1] ),
90
- parseInt( colorArray[2] ) );
91
-
92
- }
93
- else if ( actualColor.indexOf("#") == 0 ) {
94
- return Rico.Color.createFromHex(actualColor);
95
- }
96
- else
97
- return new Rico.Color(255,255,255);
98
- }
99
-
100
- /* next two functions changed to mootools color.js functions */
101
- Rico.Color.HSBtoRGB = function(hue, saturation, brightness) {
102
-
103
- var br = Math.round(brightness / 100 * 255);
104
- if (this[1] == 0){
105
- return [br, br, br];
106
- } else {
107
- var hue = this[0] % 360;
108
- var f = hue % 60;
109
- var p = Math.round((brightness * (100 - saturation)) / 10000 * 255);
110
- var q = Math.round((brightness * (6000 - saturation * f)) / 600000 * 255);
111
- var t = Math.round((brightness * (6000 - saturation * (60 - f))) / 600000 * 255);
112
- switch(Math.floor(hue / 60)){
113
- case 0: return { r : br, g : t, b : p };
114
- case 1: return { r : q, g : br, b : p };
115
- case 2: return { r : p, g : br, b : t };
116
- case 3: return { r : p, g : q, b : br };
117
- case 4: return { r : t, g : p, b : br };
118
- case 5: return { r : br, g : p, b : q };
119
- }
120
- }
121
- return false;
122
- }
123
-
124
- Rico.Color.RGBtoHSB = function(red, green, blue) {
125
- var hue, saturation, brightness;
126
- var max = Math.max(red, green, blue), min = Math.min(red, green, blue);
127
- var delta = max - min;
128
- brightness = max / 255;
129
- saturation = (max != 0) ? delta / max : 0;
130
- if (saturation == 0){
131
- hue = 0;
132
- } else {
133
- var rr = (max - red) / delta;
134
- var gr = (max - green) / delta;
135
- var br = (max - blue) / delta;
136
- if (red == max) hue = br - gr;
137
- else if (green == max) hue = 2 + rr - br;
138
- else hue = 4 + gr - rr;
139
- hue /= 6;
140
- if (hue < 0) hue++;
141
- }
142
- return { h : Math.round(hue * 360), s : Math.round(saturation * 100), b : Math.round(brightness * 100)};
143
- }
144
-
145
-
146
- //-------------------- ricoCorner.js
147
- Rico.Corner = {
148
-
149
- round: function(e, options) {
150
- var e = $(e);
151
- this._setOptions(options);
152
-
153
- var color = this.options.color;
154
- if ( this.options.color == "fromElement" )
155
- color = this._background(e);
156
-
157
- var bgColor = this.options.bgColor;
158
- if ( this.options.bgColor == "fromParent" )
159
- bgColor = this._background(e.offsetParent);
160
-
161
- this._roundCornersImpl(e, color, bgColor);
162
- },
163
-
164
- _roundCornersImpl: function(e, color, bgColor) {
165
- if(this.options.border)
166
- this._renderBorder(e,bgColor);
167
- if(this._isTopRounded())
168
- this._roundTopCorners(e,color,bgColor);
169
- if(this._isBottomRounded())
170
- this._roundBottomCorners(e,color,bgColor);
171
- },
172
-
173
- _renderBorder: function(el,bgColor) {
174
- var borderValue = "1px solid " + this._borderColor(bgColor);
175
- var borderL = "border-left: " + borderValue;
176
- var borderR = "border-right: " + borderValue;
177
- var style = "style='" + borderL + ";" + borderR + "'";
178
- el.innerHTML = "<div " + style + ">" + el.innerHTML + "</div>"
179
- },
180
-
181
- _roundTopCorners: function(el, color, bgColor) {
182
- var corner = this._createCorner(bgColor);
183
- for(var i=0 ; i < this.options.numSlices ; i++ )
184
- corner.appendChild(this._createCornerSlice(color,bgColor,i,"top"));
185
- el.style.paddingTop = 0;
186
- el.insertBefore(corner,el.firstChild);
187
- },
188
-
189
- _roundBottomCorners: function(el, color, bgColor) {
190
- var corner = this._createCorner(bgColor);
191
- for(var i=(this.options.numSlices-1) ; i >= 0 ; i-- )
192
- corner.appendChild(this._createCornerSlice(color,bgColor,i,"bottom"));
193
- el.style.paddingBottom = 0;
194
- el.appendChild(corner);
195
- },
196
-
197
- _createCorner: function(bgColor) {
198
- var corner = document.createElement("div");
199
- corner.style.backgroundColor = (this._isTransparent() ? "transparent" : bgColor);
200
- return corner;
201
- },
202
-
203
- _createCornerSlice: function(color,bgColor, n, position) {
204
- var slice = document.createElement("span");
205
-
206
- var inStyle = slice.style;
207
- inStyle.backgroundColor = color;
208
- inStyle.display = "block";
209
- inStyle.height = "1px";
210
- inStyle.overflow = "hidden";
211
- inStyle.fontSize = "1px";
212
-
213
- var borderColor = this._borderColor(color,bgColor);
214
- if ( this.options.border && n == 0 ) {
215
- inStyle.borderTopStyle = "solid";
216
- inStyle.borderTopWidth = "1px";
217
- inStyle.borderLeftWidth = "0px";
218
- inStyle.borderRightWidth = "0px";
219
- inStyle.borderBottomWidth = "0px";
220
- inStyle.height = "0px"; // assumes css compliant box model
221
- inStyle.borderColor = borderColor;
222
- }
223
- else if(borderColor) {
224
- inStyle.borderColor = borderColor;
225
- inStyle.borderStyle = "solid";
226
- inStyle.borderWidth = "0px 1px";
227
- }
228
-
229
- if ( !this.options.compact && (n == (this.options.numSlices-1)) )
230
- inStyle.height = "2px";
231
-
232
- this._setMargin(slice, n, position);
233
- this._setBorder(slice, n, position);
234
- return slice;
235
- },
236
-
237
- _setOptions: function(options) {
238
- this.options = {
239
- corners : "all",
240
- color : "fromElement",
241
- bgColor : "fromParent",
242
- blend : true,
243
- border : false,
244
- compact : false
245
- }
246
- Object.extend(this.options, options || {});
247
-
248
- this.options.numSlices = this.options.compact ? 2 : 4;
249
- if ( this._isTransparent() )
250
- this.options.blend = false;
251
- },
252
-
253
- _whichSideTop: function() {
254
- if ( this._hasString(this.options.corners, "all", "top") )
255
- return "";
256
-
257
- if ( this.options.corners.indexOf("tl") >= 0 && this.options.corners.indexOf("tr") >= 0 )
258
- return "";
259
-
260
- if (this.options.corners.indexOf("tl") >= 0)
261
- return "left";
262
- else if (this.options.corners.indexOf("tr") >= 0)
263
- return "right";
264
- return "";
265
- },
266
-
267
- _whichSideBottom: function() {
268
- if ( this._hasString(this.options.corners, "all", "bottom") )
269
- return "";
270
-
271
- if ( this.options.corners.indexOf("bl")>=0 && this.options.corners.indexOf("br")>=0 )
272
- return "";
273
-
274
- if(this.options.corners.indexOf("bl") >=0)
275
- return "left";
276
- else if(this.options.corners.indexOf("br")>=0)
277
- return "right";
278
- return "";
279
- },
280
-
281
- _borderColor : function(color,bgColor) {
282
- if ( color == "transparent" )
283
- return bgColor;
284
- else if ( this.options.border )
285
- return this.options.border;
286
- else if ( this.options.blend )
287
- return this._blend( bgColor, color );
288
- else
289
- return "";
290
- },
291
-
292
-
293
- _setMargin: function(el, n, corners) {
294
- var marginSize = this._marginSize(n);
295
- var whichSide = corners == "top" ? this._whichSideTop() : this._whichSideBottom();
296
-
297
- if ( whichSide == "left" ) {
298
- el.style.marginLeft = marginSize + "px"; el.style.marginRight = "0px";
299
- }
300
- else if ( whichSide == "right" ) {
301
- el.style.marginRight = marginSize + "px"; el.style.marginLeft = "0px";
302
- }
303
- else {
304
- el.style.marginLeft = marginSize + "px"; el.style.marginRight = marginSize + "px";
305
- }
306
- },
307
-
308
- _setBorder: function(el,n,corners) {
309
- var borderSize = this._borderSize(n);
310
- var whichSide = corners == "top" ? this._whichSideTop() : this._whichSideBottom();
311
- if ( whichSide == "left" ) {
312
- el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = "0px";
313
- }
314
- else if ( whichSide == "right" ) {
315
- el.style.borderRightWidth = borderSize + "px"; el.style.borderLeftWidth = "0px";
316
- }
317
- else {
318
- el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = borderSize + "px";
319
- }
320
- if (this.options.border != false)
321
- el.style.borderLeftWidth = borderSize + "px"; el.style.borderRightWidth = borderSize + "px";
322
- },
323
-
324
- _marginSize: function(n) {
325
- if ( this._isTransparent() )
326
- return 0;
327
-
328
- var marginSizes = [ 5, 3, 2, 1 ];
329
- var blendedMarginSizes = [ 3, 2, 1, 0 ];
330
- var compactMarginSizes = [ 2, 1 ];
331
- var smBlendedMarginSizes = [ 1, 0 ];
332
-
333
- if ( this.options.compact && this.options.blend )
334
- return smBlendedMarginSizes[n];
335
- else if ( this.options.compact )
336
- return compactMarginSizes[n];
337
- else if ( this.options.blend )
338
- return blendedMarginSizes[n];
339
- else
340
- return marginSizes[n];
341
- },
342
-
343
- _borderSize: function(n) {
344
- var transparentBorderSizes = [ 5, 3, 2, 1 ];
345
- var blendedBorderSizes = [ 2, 1, 1, 1 ];
346
- var compactBorderSizes = [ 1, 0 ];
347
- var actualBorderSizes = [ 0, 2, 0, 0 ];
348
-
349
- if ( this.options.compact && (this.options.blend || this._isTransparent()) )
350
- return 1;
351
- else if ( this.options.compact )
352
- return compactBorderSizes[n];
353
- else if ( this.options.blend )
354
- return blendedBorderSizes[n];
355
- else if ( this.options.border )
356
- return actualBorderSizes[n];
357
- else if ( this._isTransparent() )
358
- return transparentBorderSizes[n];
359
- return 0;
360
- },
361
-
362
- _hasString: function(str) { for(var i=1 ; i<arguments.length ; i++) if (str.indexOf(arguments[i]) >= 0) return true; return false; },
363
- _blend: function(c1, c2) { var cc1 = Rico.Color.createFromHex(c1); cc1.blend(Rico.Color.createFromHex(c2)); return cc1; },
364
- _background: function(el) { try { return Rico.Color.createColorFromBackground(el).asHex(); } catch(err) { return "#ffffff"; } },
365
- _isTransparent: function() { return this.options.color == "transparent"; },
366
- _isTopRounded: function() { return this._hasString(this.options.corners, "all", "top", "tl", "tr"); },
367
- _isBottomRounded: function() { return this._hasString(this.options.corners, "all", "bottom", "bl", "br"); },
368
- _hasSingleTextChild: function(el) { return el.childNodes.length == 1 && el.childNodes[0].nodeType == 3; }
369
- }
370
-