r1162 - in branches/dev/slider: tests themes/base ui
Author: rdworth
Date: Sun Dec 14 19:32:20 2008
New Revision: 1162
Modified:
branches/dev/slider/tests/slider.js
branches/dev/slider/themes/base/ui.core.css
branches/dev/slider/themes/base/ui.theme.css
branches/dev/slider/ui/ui.accordion.js
branches/dev/slider/ui/ui.core.js
branches/dev/slider/ui/ui.dialog.js
Log:
/branches/dev/slider: merged dev/slider branch up to trunk rev1161
Modified: branches/dev/slider/tests/slider.js
==============================================================================
--- branches/dev/slider/tests/slider.js (original)
+++ branches/dev/slider/tests/slider.js Sun Dec 14 19:32:20 2008
@@ -9,12 +9,16 @@
var defaults = {
animate: false,
axis: "???",
- handle: ".ui-slider-handle",
- handles: "???",
disabled: false,
+ distance: 1,
+ handle: ".ui-slider-handle",
+ handles: null,
max: 100,
min: 0,
+ noKeyboard: false,
range: false,
+ realMax: "???",
+ round: true,
startValue: "???",
stepping: "???",
steps: 0
Modified: branches/dev/slider/themes/base/ui.core.css
==============================================================================
--- branches/dev/slider/themes/base/ui.core.css (original)
+++ branches/dev/slider/themes/base/ui.core.css Sun Dec 14 19:32:20 2008
@@ -9,15 +9,12 @@
.ui-helper-hidden { display: none; }
.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0;
line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none;
}
-
.ui-helper-clearfix:after { content: "."; display: block; height: 0;
clear: both; visibility: hidden; }
.ui-helper-clearfix { display: inline-block; }
-
-/* DO NOT REMOVE THIS COMMENT - required for clearfix to work in Opera \*/
+/* required comment for clearfix to work in Opera \*/
* html .ui-helper-clearfix { height:1%; }
.ui-helper-clearfix { display:block; }
-/* end required block */
-
+/* end clearfix */
.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position:
absolute; opacity: 0; filter:Alpha(Opacity=0); }
Modified: branches/dev/slider/themes/base/ui.theme.css
==============================================================================
--- branches/dev/slider/themes/base/ui.theme.css (original)
+++ branches/dev/slider/themes/base/ui.theme.css Sun Dec 14 19:32:20 2008
@@ -10,6 +10,7 @@
----------------------------------*/
.ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/;
font-size: 1.1em/*{fsDefault}*/; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget
button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size:
1em; }
+.ui-widget a:active { outline: 0 !important; }
.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/;
background: #cccccc/*{bgColorHeader}*/
url(images/cccccc_40x100_textures_03_highlight_soft_75.png)/*{bgImgUrlHeader}*/
0 50% repeat-x; color: #222222/*{fcHeader}*/; font-weight: bold; }
.ui-widget-header a { color: #222222/*{fcHeader}*/; }
.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/;
background: #ffffff/*{bgColorContent}*/
url(images/ffffff_40x100_textures_02_glass_75.png)/*{bgImgUrlContent}*/ 0
0/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color:
#222222/*{fcContent}*/; }
@@ -19,8 +20,8 @@
----------------------------------*/
.ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/;
background: #e6e6e6/*{bgColorDefault}*/
url(images/e6e6e6_40x100_textures_02_glass_75.png)/*{bgImgUrlDefault}*/ 0
50% repeat-x; font-weight: normal/*{fwDefault}*/; color:
#555555/*{fcDefault}*/ !important; }
.ui-state-default a { color: #555555/*{fcDefault}*/; text-decoration:
none; }
-.ui-state-hover { border: 1px solid #999999/*{borderColorHover}*/;
background: #dadada/*{bgColorHover}*/
url(images/dadada_40x100_textures_02_glass_75.png)/*{bgImgUrlHover}*/ 0
50% repeat-x; font-weight: normal/*{fwDefault}*/; color:
#212121/*{fcHover}*/ !important; }
-.ui-state-hover a { color: #212121/*{fcHover}*/; text-decoration: none; }
+.ui-state-hover, .ui-state-default:focus, .ui-state-hover:focus { border:
1px solid #999999/*{borderColorHover}*/; background:
#dadada/*{bgColorHover}*/
url(images/dadada_40x100_textures_02_glass_75.png)/*{bgImgUrlHover}*/ 0
50% repeat-x; font-weight: normal/*{fwDefault}*/; color:
#212121/*{fcHover}*/ !important; }
+.ui-state-hover a, .ui-state-default:focus a, .ui-state-hover:focus a {
color: #212121/*{fcHover}*/; text-decoration: none; }
.ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/;
background: #ffffff/*{bgColorActive}*/
url(images/ffffff_40x100_textures_02_glass_65.png)/*{bgImgUrlActive}*/ 0
50% repeat-x; font-weight: normal/*{fwDefault}*/; color:
#212121/*{fcActive}*/ !important; outline: none; }
.ui-state-active a { color: #212121/*{fcActive}*/; outline: none;
text-decoration: none; }
Modified: branches/dev/slider/ui/ui.accordion.js
==============================================================================
--- branches/dev/slider/ui/ui.accordion.js (original)
+++ branches/dev/slider/ui/ui.accordion.js Sun Dec 14 19:32:20 2008
@@ -39,8 +39,8 @@
var active = options.active = findActive(headers,
options.active).toggleClass("ui-state-default").toggleClass("ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");
active.parent().addClass("selected");
- $("<span/>").addClass("ui-icon ui-icon-triangle-1-e").prependTo(headers);
-
active.find(".ui-icon").toggleClass("ui-icon-triangle-1-e").toggleClass("ui-icon-triangle-1-s");
+ $("<span/>").addClass("ui-icon " +
this.options.headerIcon).prependTo(headers);
+
active.find(".ui-icon").toggleClass(this.options.headerIcon).toggleClass(this.options.headerIconSelected);
// IE7-/Win - Extra vertical space in Lists fixed
if ($.browser.msie) {
@@ -115,7 +115,7 @@
if (this.options.disabled || event.altKey || event.ctrlKey)
return;
- var keyCode = $.keyCode;
+ var keyCode = $.ui.keyCode;
var length = this.options.headers.length;
var currentIndex = this.options.headers.index(event.target);
@@ -297,11 +297,11 @@
// switch classes
options.active.parent().toggleClass(options.selectedClass);
options.active.removeClass("ui-state-active
ui-corner-top").addClass("ui-state-default ui-corner-all")
-
.find(".ui-icon").removeClass("ui-icon-triangle-1-s").addClass("ui-icon-triangle-1-e");
+
.find(".ui-icon").removeClass(options.headerIconSelected).addClass(options.headerIcon);
if ( !clickedActive ) {
clicked.parent().addClass(options.selectedClass);
clicked.removeClass("ui-state-default
ui-corner-all").addClass("ui-state-active ui-corner-top")
-
.find(".ui-icon").removeClass("ui-icon-triangle-1-e").addClass("ui-icon-triangle-1-s");
+
.find(".ui-icon").removeClass(options.headerIcon).addClass(options.headerIconSelected);
}
// find elements to show and hide
@@ -340,6 +340,8 @@
animated: 'slide',
event: "click",
header: "a",
+ headerIcon: "ui-icon-triangle-1-e",
+ headerIconSelected: "ui-icon-triangle-1-s",
navigationFilter: function() {
return this.href.toLowerCase() == location.href.toLowerCase();
},
Modified: branches/dev/slider/ui/ui.core.js
==============================================================================
--- branches/dev/slider/ui/ui.core.js (original)
+++ branches/dev/slider/ui/ui.core.js Sun Dec 14 19:32:20 2008
@@ -9,40 +9,9 @@
*/
;(function($) {
-/** jQuery core modifications and additions **/
-$.keyCode = {
- BACKSPACE: 8,
- CAPS_LOCK: 20,
- COMMA: 188,
- CONTROL: 17,
- DELETE: 46,
- DOWN: 40,
- END: 35,
- ENTER: 13,
- ESCAPE: 27,
- HOME: 36,
- INSERT: 45,
- LEFT: 37,
- NUMPAD_ADD: 107,
- NUMPAD_DECIMAL: 110,
- NUMPAD_DIVIDE: 111,
- NUMPAD_ENTER: 108,
- NUMPAD_MULTIPLY: 106,
- NUMPAD_SUBTRACT: 109,
- PAGE_DOWN: 34,
- PAGE_UP: 33,
- PERIOD: 190,
- RIGHT: 39,
- SHIFT: 16,
- SPACE: 32,
- TAB: 9,
- UP: 38
-};
-
var _remove = $.fn.remove,
isFF2 = $.browser.mozilla && (parseFloat($.browser.version) < 1.9);
-
//Helper functions and ui object
$.ui = {
@@ -126,7 +95,37 @@
isOver: function(y, x, top, left, height, width) {
//Determines when x, y coordinates is over "b" element
return $.ui.isOverAxis(y, top, height) && $.ui.isOverAxis(x, left,
width);
+ },
+
+ keyCode: {
+ BACKSPACE: 8,
+ CAPS_LOCK: 20,
+ COMMA: 188,
+ CONTROL: 17,
+ DELETE: 46,
+ DOWN: 40,
+ END: 35,
+ ENTER: 13,
+ ESCAPE: 27,
+ HOME: 36,
+ INSERT: 45,
+ LEFT: 37,
+ NUMPAD_ADD: 107,
+ NUMPAD_DECIMAL: 110,
+ NUMPAD_DIVIDE: 111,
+ NUMPAD_ENTER: 108,
+ NUMPAD_MULTIPLY: 106,
+ NUMPAD_SUBTRACT: 109,
+ PAGE_DOWN: 34,
+ PAGE_UP: 33,
+ PERIOD: 190,
+ RIGHT: 39,
+ SHIFT: 16,
+ SPACE: 32,
+ TAB: 9,
+ UP: 38
}
+
};
// WAI-ARIA normalization
Modified: branches/dev/slider/ui/ui.dialog.js
==============================================================================
--- branches/dev/slider/ui/ui.dialog.js (original)
+++ branches/dev/slider/ui/ui.dialog.js Sun Dec 14 19:32:20 2008
@@ -124,7 +124,7 @@
// setting outline to 0 prevents a border on focus in Mozilla
.attr('tabIndex', -1).css('outline', 0).keydown(function(ev) {
(options.closeOnEscape && ev.keyCode
- && ev.keyCode == $.keyCode.ESCAPE && self.close());
+ && ev.keyCode == $.ui.keyCode.ESCAPE && self.close());
})
.attr({
role: 'dialog',
@@ -226,7 +226,7 @@
// prevent tabbing out of modal dialogs
(this.options.modal && this.uiDialog.bind('keypress.ui-dialog',
function(event) {
- if (event.keyCode != $.keyCode.TAB) {
+ if (event.keyCode != $.ui.keyCode.TAB) {
return;
}
@@ -508,7 +508,7 @@
// allow closing by pressing the escape key
$(document).bind('keydown.dialog-overlay', function(event) {
(dialog.options.closeOnEscape && event.keyCode
- && event.keyCode == $.keyCode.ESCAPE && dialog.close());
+ && event.keyCode == $.ui.keyCode.ESCAPE && dialog.close());
});
// handle window resize