r863 - in branches/experimental: tests/visual/menu ui
Author: paul.bakaus
Date: Wed Nov 5 02:18:04 2008
New Revision: 863
Modified:
branches/experimental/tests/visual/menu/menu.html
branches/experimental/ui/ui.core.position.js
branches/experimental/ui/ui.menu.js
Log:
core(experimental): renamed position to positionTo, due to a conflict with
the existing position method
Modified: branches/experimental/tests/visual/menu/menu.html
==============================================================================
--- branches/experimental/tests/visual/menu/menu.html (original)
+++ branches/experimental/tests/visual/menu/menu.html Wed Nov 5 02:18:04
2008
@@ -28,9 +28,9 @@
$(document).ready(function() {
- //$('#menu1').menu({
- // mode: 'static'
- //});
+ $('#menu1').menu({
+ mode: 'static'
+ });
$('button').menu({
items: '#items2'
Modified: branches/experimental/ui/ui.core.position.js
==============================================================================
--- branches/experimental/ui/ui.core.position.js (original)
+++ branches/experimental/ui/ui.core.position.js Wed Nov 5 02:18:04 2008
@@ -1,4 +1,4 @@
-$.fn.position = function(e, o) {
+$.fn.positionTo = function(e, o) {
var parentOffset = this.parent().offset();
parentOffset = {
Modified: branches/experimental/ui/ui.menu.js
==============================================================================
--- branches/experimental/ui/ui.menu.js (original)
+++ branches/experimental/ui/ui.menu.js Wed Nov 5 02:18:04 2008
@@ -133,7 +133,7 @@
showTimer = setTimeout(function(){
subList.addClass('ui-component-content').show();
- subList.position(e, {
+ subList.positionTo(e, {
relativeTo: subList.parent(),
direction: 'right'
});
@@ -183,7 +183,7 @@
}
this.menu.show();
- this.menu.position(e, {
+ this.menu.positionTo(e, {
relativeTo: this.options.mode == 'context' ? 'mouse' : this.element,
direction: this.options.direction
});