r933 - branches/experimental/autotest branches/experimental/coverflow branches/experimental/demos...
Author: rdworth
Date: Thu Nov 13 19:00:16 2008
New Revision: 933
Modified:
branches/experimental/autotest/jquery.useraction.js
branches/experimental/autotest/ui.testmouse.js
branches/experimental/coverflow/ui.coverflow.js
branches/experimental/demos/functional/templates/ui.colorpicker.html
branches/experimental/tests/visual/colorpicker.html
branches/experimental/tests/visual/keyboard_selection.html
branches/experimental/tests/visual/menu/menu.html
branches/experimental/ui/ui.autocomplete.js
branches/experimental/ui/ui.colorpicker.js
branches/experimental/ui/ui.core.js
branches/experimental/ui/ui.core.position.js
branches/experimental/ui/ui.datepicker.js
branches/experimental/ui/ui.grid.js
branches/experimental/ui/ui.history.js
branches/experimental/ui/ui.magnifier.js
branches/experimental/ui/ui.menu.js
branches/experimental/ui/ui.selectable.js
branches/experimental/ui/ui.sortable.js
branches/experimental/ui/ui.sortableTree.js
branches/experimental/ui/widget-auto-getters/ui.core.js
branches/experimental/ui/widget-auto-getters/ui.dialog.js
trunk/demos/functional/js/behaviour.js
trunk/demos/real-world/image-cropper/index.html
trunk/demos/real-world/layout/demo.js
trunk/demos/real-world/photo-manager/js/demo.js
trunk/demos/real-world/range-interface/index.html
trunk/tests/draggable.js
trunk/tests/slider.js
trunk/tests/sortable.js
trunk/tests/visual/spinner.html
trunk/ui/ui.accordion.js
trunk/ui/ui.core.js
trunk/ui/ui.datepicker.js
trunk/ui/ui.dialog.js
trunk/ui/ui.draggable.js
trunk/ui/ui.droppable.js
trunk/ui/ui.progressbar.js
trunk/ui/ui.resizable.js
trunk/ui/ui.selectable.js
trunk/ui/ui.slider.js
trunk/ui/ui.sortable.js
trunk/ui/ui.spinner.js
trunk/ui/ui.tabs.js
Log:
fixed #3578 - ALL CODE: e, ui should be changed to event, ui
Modified: branches/experimental/autotest/jquery.useraction.js
==============================================================================
--- branches/experimental/autotest/jquery.useraction.js (original)
+++ branches/experimental/autotest/jquery.useraction.js Thu Nov 13 19:00:16
2008
@@ -99,7 +99,7 @@
keyCode: o.keyCode || 0, charCode: o.charCode || 0
});
- // avoid e.type == undefined before dispatchment
+ // avoid event.type == undefined before dispatchment
EVT.type = type;
if (o.before) o.before.apply(this.target, [$.event.fix(EVT), o.x, o.y,
this]);
Modified: branches/experimental/autotest/ui.testmouse.js
==============================================================================
--- branches/experimental/autotest/ui.testmouse.js (original)
+++ branches/experimental/autotest/ui.testmouse.js Thu Nov 13 19:00:16 2008
@@ -13,10 +13,10 @@
var mouseY = 0;
$(function() {
- $(document).mousemove(function(e) {
- if (e.isTrusted !== false) {
- mouseX = e.pageX;
- mouseY = e.pageY;
+ $(document).mousemove(function(event) {
+ if (event.isTrusted !== false) {
+ mouseX = event.pageX;
+ mouseY = event.pageY;
}
});
});
@@ -77,7 +77,7 @@
fakemouse.appendTo('body').css({ position: 'absolute', left: mouseX,
top: mouseY, zIndex: 5000 });
realmouse.appendTo('body').css({ position: 'absolute', left: mouseX,
top: mouseY, zIndex: 5000, opacity: 0.1 });
mousescreen.appendTo('body').css({ width: '100%', height: '100%',
position: 'absolute', top: 0, left: 0, zIndex: 5000 })
- .mousemove(function(e) { realmouse.css({ left: e.pageX, top: e.pageY
}); return false; })
+ .mousemove(function(event) { realmouse.css({ left: event.pageX, top:
event.pageY }); return false; })
.mousedown(function() { return false; })
.mouseup(function() { return false; });
mousescreen.css('cursor', 'url(' + noneUrl + '), crosshair');
Modified: branches/experimental/coverflow/ui.coverflow.js
==============================================================================
--- branches/experimental/coverflow/ui.coverflow.js (original)
+++ branches/experimental/coverflow/ui.coverflow.js Thu Nov 13 19:00:16 2008
@@ -12,14 +12,14 @@
this.itemWidth = this.items.outerWidth(true);
//THIS IS FOR DEMO PURPOSES ONLY!
- $(document).bind("keydown", function(e) {
+ $(document).bind("keydown", function(event) {
- if(e.keyCode == 39 && self.items.length > self.current+1) {
+ if(event.keyCode == 39 && self.items.length > self.current+1) {
self.moveTo(self.current+1);
$("div.slider").slider("moveTo", self.current, null, true);
}
- if(e.keyCode == 37 && self.current-1 >= 0) {
+ if(event.keyCode == 37 && self.current-1 >= 0) {
self.moveTo(self.current-1);
$("div.slider").slider("moveTo", self.current, null, true);
}
@@ -30,7 +30,7 @@
min: 0,
max: self.items.length-1,
noKeyboard: true,
- slide: function(e, ui) {
+ slide: function(event, ui) {
self.moveTo(ui.value);
}
});
Modified:
branches/experimental/demos/functional/templates/ui.colorpicker.html
==============================================================================
--- branches/experimental/demos/functional/templates/ui.colorpicker.html
(original)
+++ branches/experimental/demos/functional/templates/ui.colorpicker.html
Thu Nov 13 19:00:16 2008
@@ -24,8 +24,8 @@
html: '<input id="colorpicker2"
/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>',
destroy: '$("#colorpicker2").colorpicker("destroy");',
options: [
- { desc: 'Make a colorpicker',
source: '$("#colorpicker2").colorpicker( {submit: function(e,ui) {
$("#colorpicker2").val(ui.hex);} });' },
- { desc: 'Fade in/out a colorpicker',
source: '$("#colorpicker2").colorpicker( {show: function (e,ui) {
$(this).data("colorpicker").picker.fadeIn(500);return false; }, hide:
function (e,ui) { $(this).data("colorpicker").picker.fadeOut(500);return
false; }, change: function(e,ui) { $("#colorpicker2").val(ui.hex); } });' }
+ { desc: 'Make a colorpicker',
source: '$("#colorpicker2").colorpicker( {submit: function(event,ui) {
$("#colorpicker2").val(ui.hex);} });' },
+ { desc: 'Fade in/out a colorpicker',
source: '$("#colorpicker2").colorpicker( {show: function (event,ui) {
$(this).data("colorpicker").picker.fadeIn(500);return false; }, hide:
function (event,ui) {
$(this).data("colorpicker").picker.fadeOut(500);return false; }, change:
function(event,ui) { $("#colorpicker2").val(ui.hex); } });' }
]
}
Modified: branches/experimental/tests/visual/colorpicker.html
==============================================================================
--- branches/experimental/tests/visual/colorpicker.html (original)
+++ branches/experimental/tests/visual/colorpicker.html Thu Nov 13 19:00:16
2008
@@ -242,7 +242,7 @@
$('#colorpickerHolder2').colorpicker({
flat: true,
color: '#00ff00',
- submit: function(e, ui) {
+ submit: function(event, ui) {
$('#colorSelector2 div').css('backgroundColor', '#' + ui.hex);
}
});
@@ -253,10 +253,10 @@
widt = !widt;
});
$('#colorpickerField1').colorpicker({
- submit: function(e, ui) {
+ submit: function(event, ui) {
$('#colorpickerField1').val(ui.hex);
},
- beforeShow: function (e, ui) {
+ beforeShow: function (event, ui) {
$(this).colorpicker("setColor", this.value);
}
})
@@ -265,15 +265,15 @@
});
$('#colorSelector').colorpicker({
color: '#0000ff',
- show: function (e, ui) {
+ show: function (event, ui) {
$(this).data("colorpicker").picker.fadeIn(500);
return false;
},
- hide: function (e, ui) {
+ hide: function (event, ui) {
$(this).data("colorpicker").picker.fadeOut(500);
return false;
},
- change: function (e, ui) {
+ change: function (event, ui) {
$('#colorSelector div').css('backgroundColor', '#' + ui.hex);
}
});
Modified: branches/experimental/tests/visual/keyboard_selection.html
==============================================================================
--- branches/experimental/tests/visual/keyboard_selection.html (original)
+++ branches/experimental/tests/visual/keyboard_selection.html Thu Nov 13
19:00:16 2008
@@ -26,7 +26,7 @@
$("ul").selectable({
- select: function(e, ui) {
+ select: function(event, ui) {
//console.log(ui.selection);
}
Modified: branches/experimental/tests/visual/menu/menu.html
==============================================================================
--- branches/experimental/tests/visual/menu/menu.html (original)
+++ branches/experimental/tests/visual/menu/menu.html Thu Nov 13 19:00:16
2008
@@ -35,10 +35,10 @@
mode: 'static',
type: 'drilldown',
//selectCategories: true,
- choose: function(e, ui) {
+ choose: function(event, ui) {
console.log('Selected item ', ui.item);
},
- browse: function(e, ui) {
+ browse: function(event, ui) {
//console.log('Browsing item ', ui.item);
}
});
@@ -47,20 +47,20 @@
items: '#items2',
mode: 'dropdown',
flyoutDelay: 300,
- choose: function(e, ui) {
+ choose: function(event, ui) {
console.log('Selected item ', ui.item);
},
- browse: function(e, ui) {
+ browse: function(event, ui) {
//console.log('Browsing item ', ui.item);
},
- open: function(e, ui) {
+ open: function(event, ui) {
$(this).menu('add', '<li><a href="#">Test Item 1</a></li>', '7');
$(this).menu('add', '<li><a href="#">Test Item 2</a><ul><li><a
href="#">Test Item Sub</a></li></ul></li>', '1/1');
//console.log('Opened menu');
},
- close: function(e, ui) {
+ close: function(event, ui) {
//console.log('Closed menu');
}
});
@@ -98,16 +98,16 @@
mode: 'context',
//appendTo: 'element',
//direction: 'left above',
- choose: function(e, ui) {
+ choose: function(event, ui) {
console.log('Selected item ', ui.item);
},
- browse: function(e, ui) {
+ browse: function(event, ui) {
//console.log('Browsing item ', ui.item);
},
- open: function(e, ui) {
+ open: function(event, ui) {
//console.log('Opened menu');
},
- close: function(e, ui) {
+ close: function(event, ui) {
//console.log('Closed menu');
}
});
Modified: branches/experimental/ui/ui.autocomplete.js
==============================================================================
--- branches/experimental/ui/ui.autocomplete.js (original)
+++ branches/experimental/ui/ui.autocomplete.js Thu Nov 13 19:00:16 2008
@@ -52,13 +52,13 @@
});
// only opera doesn't trigger keydown multiple times while pressed,
others don't work with keypress at all
- $input.bind(($.browser.opera ? "keypress" : "keydown")
+ ".autocomplete", function(e) {
+ $input.bind(($.browser.opera ? "keypress" : "keydown")
+ ".autocomplete", function(event) {
// track last key pressed
- lastKeyPressCode = e.keyCode;
- switch(e.keyCode) {
+ lastKeyPressCode = event.keyCode;
+ switch(event.keyCode) {
case KEY.UP:
- e.preventDefault();
+ event.preventDefault();
if ( select.visible() ) {
select.prev();
} else {
@@ -67,7 +67,7 @@
break;
case KEY.DOWN:
- e.preventDefault();
+ event.preventDefault();
if ( select.visible() ) {
select.next();
} else {
@@ -76,7 +76,7 @@
break;
case KEY.PAGE_UP:
- e.preventDefault();
+ event.preventDefault();
if ( select.visible() ) {
select.pageUp();
} else {
@@ -85,7 +85,7 @@
break;
case KEY.PAGE_DOWN:
- e.preventDefault();
+ event.preventDefault();
if ( select.visible() ) {
select.pageDown();
} else {
@@ -99,7 +99,7 @@
case KEY.ENTER:
if( selectCurrent() ) {
// stop default to prevent a form submit, Opera needs special
handling
- e.preventDefault();
+ event.preventDefault();
blockSubmit = true;
return false;
}
@@ -356,13 +356,13 @@
};
},
- _propagate: function(n,e) {
- $.ui.plugin.call(this, n, [e, this.ui()]);
- return this.element.triggerHandler(n == 'autocomplete' ?
n : 'autocomplete'+n, [e, this.ui()], this.options[n]);
+ _propagate: function(n, event) {
+ $.ui.plugin.call(this, n, [event, this.ui()]);
+ return this.element.triggerHandler(n == 'autocomplete' ?
n : 'autocomplete'+n, [event, this.ui()], this.options[n]);
},
// Public methods
- ui: function(e) {
+ ui: function(event) {
return {
options: this.options,
element: this.element
@@ -611,8 +611,8 @@
needsInit = false;
}
- function target(e) {
- var element = e.target;
+ function target(event) {
+ var element = event.target;
while(element && element.tagName != "LI")
element = element.parentNode;
// more fun with IE, sometimes event.target is empty, just ignore it then
Modified: branches/experimental/ui/ui.colorpicker.js
==============================================================================
--- branches/experimental/ui/ui.colorpicker.js (original)
+++ branches/experimental/ui/ui.colorpicker.js Thu Nov 13 19:00:16 2008
@@ -40,25 +40,25 @@
}
this.fields = this.picker.find('input')
- .bind('keydown', function(e) { return self._keyDown.call(self, e); })
- .bind('change', function(e) { return self._change.call(self, e); })
- .bind('blur', function(e) { return self._blur.call(self, e); })
- .bind('focus', function(e) { return self._focus.call(self, e); });
+ .bind('keydown', function(event) { return self._keyDown.call(self,
event); })
+ .bind('change', function(event) { return self._change.call(self,
event); })
+ .bind('blur', function(event) { return self._blur.call(self, event);
})
+ .bind('focus', function(event) { return self._focus.call(self,
event); });
- this.picker.find('span').bind('mousedown', function(e) { return
self._downIncrement.call(self, e); });
+ this.picker.find('span').bind('mousedown', function(event) { return
self._downIncrement.call(self, event); });
- this.selector =
this.picker.find('div.ui-colorpicker-color').bind('mousedown', function(e)
{ return self._downSelector.call(self, e); });
+ this.selector =
this.picker.find('div.ui-colorpicker-color').bind('mousedown',
function(event) { return self._downSelector.call(self, event); });
this.selectorIndic = this.selector.find('div div');
this.hue = this.picker.find('div.ui-colorpicker-hue div');
- this.picker.find('div.ui-colorpicker-hue').bind('mousedown', function(e)
{ return sel
Topic Participants
Richard Worth