Skip to content

Commit

Permalink
- Added some argument validation to the DataView.
Browse files Browse the repository at this point in the history
- DataView no longer fires the "onRowsChanged" event when some rows have been deleted at the end.
- Unit tests for DataView and skeleton test for the Grid.
  • Loading branch information
mleibman committed Apr 9, 2010
1 parent 85d16e4 commit bf60f6a
Show file tree
Hide file tree
Showing 9 changed files with 1,202 additions and 397 deletions.
150 changes: 150 additions & 0 deletions lib/jquery.simulate.js
@@ -0,0 +1,150 @@
/*
* jquery.simulate - simulate browser mouse and keyboard events
*
* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
*
*/

;(function($) {

$.fn.extend({
simulate: function(type, options) {
return this.each(function() {
var opt = $.extend({}, $.simulate.defaults, options || {});
new $.simulate(this, type, opt);
});
}
});

$.simulate = function(el, type, options) {
this.target = el;
this.options = options;

if (/^drag$/.test(type)) {
this[type].apply(this, [this.target, options]);
} else {
this.simulateEvent(el, type, options);
}
}

$.extend($.simulate.prototype, {
simulateEvent: function(el, type, options) {
var evt = this.createEvent(type, options);
this.dispatchEvent(el, type, evt, options);
return evt;
},
createEvent: function(type, options) {
if (/^mouse(over|out|down|up|move)|(dbl)?click$/.test(type)) {
return this.mouseEvent(type, options);
} else if (/^key(up|down|press)$/.test(type)) {
return this.keyboardEvent(type, options);
}
},
mouseEvent: function(type, options) {
var evt;
var e = $.extend({
bubbles: true, cancelable: (type != "mousemove"), view: window, detail: 0,
screenX: 0, screenY: 0, clientX: 0, clientY: 0,
ctrlKey: false, altKey: false, shiftKey: false, metaKey: false,
button: 0, relatedTarget: undefined
}, options);

var relatedTarget = $(e.relatedTarget)[0];

if ($.isFunction(document.createEvent)) {
evt = document.createEvent("MouseEvents");
evt.initMouseEvent(type, e.bubbles, e.cancelable, e.view, e.detail,
e.screenX, e.screenY, e.clientX, e.clientY,
e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
e.button, e.relatedTarget || document.body.parentNode);
} else if (document.createEventObject) {
evt = document.createEventObject();
$.extend(evt, e);
evt.button = { 0:1, 1:4, 2:2 }[evt.button] || evt.button;
}
return evt;
},
keyboardEvent: function(type, options) {
var evt;

var e = $.extend({ bubbles: true, cancelable: true, view: window,
ctrlKey: false, altKey: false, shiftKey: false, metaKey: false,
keyCode: 0, charCode: 0
}, options);

if ($.isFunction(document.createEvent)) {
try {
evt = document.createEvent("KeyEvents");
evt.initKeyEvent(type, e.bubbles, e.cancelable, e.view,
e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
e.keyCode, e.charCode);
} catch(err) {
evt = document.createEvent("Events");
evt.initEvent(type, e.bubbles, e.cancelable);
$.extend(evt, { view: e.view,
ctrlKey: e.ctrlKey, altKey: e.altKey, shiftKey: e.shiftKey, metaKey: e.metaKey,
keyCode: e.keyCode, charCode: e.charCode
});
}
} else if (document.createEventObject) {
evt = document.createEventObject();
$.extend(evt, e);
}
if ($.browser.msie || $.browser.opera) {
evt.keyCode = (e.charCode > 0) ? e.charCode : e.keyCode;
evt.charCode = undefined;
}
return evt;
},

dispatchEvent: function(el, type, evt) {
if (el.dispatchEvent) {
el.dispatchEvent(evt);
} else if (el.fireEvent) {
el.fireEvent('on' + type, evt);
}
return evt;
},

drag: function(el) {
var self = this, center = this.findCenter(this.target),
options = this.options, x = Math.floor(center.x), y = Math.floor(center.y),
dx = options.dx || 0, dy = options.dy || 0, target = this.target;
var coord = { clientX: x, clientY: y };
this.simulateEvent(target, "mousedown", coord);
coord = { clientX: x + 1, clientY: y + 1 };
this.simulateEvent(document, "mousemove", coord);
coord = { clientX: x + dx, clientY: y + dy };
this.simulateEvent(document, "mousemove", coord);
this.simulateEvent(document, "mousemove", coord);
this.simulateEvent(target, "mouseup", coord);
},
findCenter: function(el) {
var el = $(this.target), o = el.offset();
return {
x: o.left + el.outerWidth() / 2,
y: o.top + el.outerHeight() / 2
};
}
});

$.extend($.simulate, {
defaults: {
speed: 'sync'
},
VK_TAB: 9,
VK_ENTER: 13,
VK_ESC: 27,
VK_PGUP: 33,
VK_PGDN: 34,
VK_END: 35,
VK_HOME: 36,
VK_LEFT: 37,
VK_UP: 38,
VK_RIGHT: 39,
VK_DOWN: 40
});

})(jQuery);
1 change: 0 additions & 1 deletion slick.grid.js
Expand Up @@ -270,7 +270,6 @@ if (!jQuery.fn.drag) {
var currentEditor = null;
var editController;


var rowsCache = {};
var renderedRows = 0;
var numVisibleRows;
Expand Down
12 changes: 8 additions & 4 deletions slick.model.js
Expand Up @@ -29,7 +29,7 @@ function EventHelper() {
var self = this;

// private
var idProperty = "id"; // property holding a unique row id
var idProperty = "id"; // property holding a unique row id
var items = []; // data by index
var rows = []; // data by row
var idxById = {}; // indexes by id
Expand Down Expand Up @@ -112,10 +112,10 @@ function EventHelper() {
Object.prototype.toString = (typeof field == "function")?field:function() { return this[field] };
// an extra reversal for descending sort keeps the sort stable
// (assuming a stable native sort implementation, which isn't true in some cases)
if (!ascending) items.reverse();
if (ascending === false) items.reverse();
items.sort();
Object.prototype.toString = oldToString;
if (!ascending) items.reverse();
if (ascending === false) items.reverse();
refreshIdxById();
refresh();
}
Expand Down Expand Up @@ -150,6 +150,8 @@ function EventHelper() {
}

function updateItem(id, item) {
if (idxById[id] === undefined || id !== item[idProperty])
throw "Invalid or non-matching id";
items[idxById[id]] = item;
if (!updated) updated = {};
updated[id] = true;
Expand All @@ -169,6 +171,8 @@ function EventHelper() {
}

function deleteItem(id) {
if (idxById[id] === undefined)
throw "Invalid id";
items.splice(idxById[id], 1);
refreshIdxById(); // TODO: optimize
refresh();
Expand Down Expand Up @@ -231,7 +235,7 @@ function EventHelper() {

if (totalRowsBefore != totalRows) onPagingInfoChanged.notify(getPagingInfo());
if (countBefore != rows.length) onRowCountChanged.notify({previous:countBefore, current:rows.length});
if (diff.length > 0 || countBefore != rows.length) onRowsChanged.notify(diff);
if (diff.length > 0) onRowsChanged.notify(diff);
}


Expand Down

0 comments on commit bf60f6a

Please sign in to comment.