lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-04-05 20:48:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ericdrowell/KineticJS

Browse Source
This commit is contained in:
Eric Rowell 2013-08-25 00:35:53 -07:00
commit bf39df54b0
5 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
presentation-schedule.md
View File

@ -1,12 +1,37 @@
# Presentation Schedule
To add/modify your presentation, just click the "Edit" button, make your changes, and submit for review.
## Aug 30 2013
* _Event:_ [devLink Technical Conference](http://www.devlink.net/)
* _Session:_ [Custom Graphics for Your Web Application: The HTML5 Canvas and Kinetic.js](http://www.devlink.net/agenda)
* _Speaker:_ [Jason Follas](http://www.devlink.net/speakers) [@jfollas](https://twitter.com/jfollas)
## Aug 14 2013
* _Event:_ [That Conference](http://www.thatconference.com/)
* _Session:_ [Custom Graphics for Your Web Application: The HTML5 Canvas and Kinetic.js](http://www.thatconference.com/sessions/session_953)
* _Speaker:_ [Jason Follas](http://www.thatconference.com/Speakers/speaker_415) [@jfollas](https://twitter.com/jfollas)
## Jul 12 2013
* _Event:_ [Codestock](http://www.codestock.org/)
* _Session:_ [Custom Graphics for Your Web Application: The HTML5 Canvas and Kinetic.js](http://www.codestock.org/sessions/custom-graphics-for-your-web-application-the-html5-canvas-and-kinetic-js/)
* _Speaker:_ [Jason Follas](http://www.codestock.org/speakers/jason-follas/) [@jfollas](https://twitter.com/jfollas)
## May 17 2013
* _Event:_ [Stir Trek](http://www.stirtrek.com/)
* _Session:_ [Custom Graphics for Your Web Application: The HTML5 Canvas and Kinetic.js](http://www.stirtrek.com/Sessions)
* _Speaker:_ [Jason Follas](http://www.stirtrek.com/Speakers) [@jfollas](https://twitter.com/jfollas)
## Apr 25 2013
* _Event:_ [Front End Developers United](http://www.meetup.com/Front-End-Developers-United/events/114192072/)
* _Session:_ [Data Viz and KineticJS](http://www.meetup.com/Front-End-Developers-United/events/114192072/)
* _Speaker:_ [Eric Rowell](http://www.twitter.com/ericdrowell)
* _Video:_ [http://www.youtube.com/watch?feature=player_detailpage&v=ZS6QqNJ0VRA#t=1s](http://www.youtube.com/watch?feature=player_detailpage&v=ZS6QqNJ0VRA#t=1s)
## Apr 10 2013
* _Event:_ [DevIntersection](http://devintersection.com/default.aspx)
* _Session:_ Custom Graphics for Your Web Application: The HTML5 Canvas and Kinetic.js
* _Speaker:_ Jason Follas [@jfollas](https://twitter.com/jfollas)
## Mar 13 2013
* _Event:_ [Toledo Web Professionals](http://www.meetup.com/Toledo-Web-Design/events/92857942/)
* _Session:_ [Canvas Interaction with Jason Follas at Hanson, Inc.](http://www.meetup.com/Toledo-Web-Design/events/92857942/)

2
src/DragAndDrop.js
View File

@ -94,7 +94,7 @@
};
Kinetic.Node.prototype._setDragPosition = function(evt) {
var dd = Kinetic.DD
var dd = Kinetic.DD,
pos = this.getStage().getPointerPosition(),
dbf = this.getDragBoundFunc(),
newNodePos = {

2
src/Node.js
View File

@ -201,7 +201,7 @@
off: function(evtStr) {
var events = evtStr.split(SPACE),
len = events.length,
n, i, event, parts, baseEvent, name;
n, i, t, event, parts, baseEvent, name;
for(n = 0; n < len; n++) {
event = events[n];

4
src/Stage.js
View File

@ -370,12 +370,12 @@
shape = obj.shape;
if(shape) {
if(!go.isDragging() && obj.pixel[3] === 255 && (!this.targetShape || this.targetShape._id !== shape._id)) {
shape._fireAndBubble(MOUSEOVER, evt, this.targetShape);
shape._fireAndBubble(MOUSEENTER, evt, this.targetShape);
if(this.targetShape) {
this.targetShape._fireAndBubble(MOUSEOUT, evt, shape);
this.targetShape._fireAndBubble(MOUSELEAVE, evt, shape);
}
shape._fireAndBubble(MOUSEOVER, evt, this.targetShape);
shape._fireAndBubble(MOUSEENTER, evt, this.targetShape);
this.targetShape = shape;
}
else {

14
src/shapes/Image.js
View File

@ -118,15 +118,11 @@
filter = this.getFilter(),
filterCanvas, context, imageData;
if (this.filterCanvas){
filterCanvas = this.filterCanvas;
}
else {
filterCanvas = this.filterCanvas = new Kinetic.SceneCanvas({
width: width,
height: height
});
}
filterCanvas = this.filterCanvas = new Kinetic.SceneCanvas({
width: width,
height: height
});
context = filterCanvas.getContext();