lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-11-24 16:53:06 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lavrton
2015-02-03 10:40:58 +07:00
parent d48439b952 f976815acd
commit 1c27dca0d5
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
konva.js
View File

@@ -932,8 +932,8 @@ var Konva = {};
HASH = '#', HASH = '#',
EMPTY_STRING = '', EMPTY_STRING = '',
ZERO = '0', ZERO = '0',
KINETIC_WARNING = 'Konva warning: ', KONVA_WARNING = 'Konva warning: ',
KINETIC_ERROR = 'Konva error: ', KONVA_ERROR = 'Konva error: ',
RGB_PAREN = 'rgb(', RGB_PAREN = 'rgb(',
COLORS = { COLORS = {
aqua: [0,255,255], aqua: [0,255,255],
@@ -1253,7 +1253,7 @@ var Konva = {};
return str.charAt(0).toUpperCase() + str.slice(1); return str.charAt(0).toUpperCase() + str.slice(1);
}, },
error: function(str) { error: function(str) {
throw new Error(KINETIC_ERROR + str); throw new Error(KONVA_ERROR + str);
}, },
warn: function(str) { warn: function(str) {
/* /*
@@ -1261,7 +1261,7 @@ var Konva = {};
* if we don't use window.console in the conditional * if we don't use window.console in the conditional
*/ */
if(Konva.root.console && console.warn && Konva.showWarnings) { if(Konva.root.console && console.warn && Konva.showWarnings) {
console.warn(KINETIC_WARNING + str); console.warn(KONVA_WARNING + str);
} }
}, },
extend: function(child, parent) { extend: function(child, parent) {
@@ -2283,7 +2283,7 @@ var Konva = {};
EMPTY_STRING = '', EMPTY_STRING = '',
GET = 'get', GET = 'get',
ID = 'id', ID = 'id',
KINETIC = 'konva', KONVA = 'konva',
LISTENING = 'listening', LISTENING = 'listening',
MOUSEENTER = 'mouseenter', MOUSEENTER = 'mouseenter',
MOUSELEAVE = 'mouseleave', MOUSELEAVE = 'mouseleave',
@@ -3529,7 +3529,7 @@ var Konva = {};
* don't include konva namespaced listeners because * don't include konva namespaced listeners because
* these are generated by the constructors * these are generated by the constructors
*/ */
if(listener.name.indexOf(KINETIC) < 0) { if(listener.name.indexOf(KONVA) < 0) {
// if listeners array doesn't exist, then create it // if listeners array doesn't exist, then create it
if(!node.eventListeners[key]) { if(!node.eventListeners[key]) {
node.eventListeners[key] = []; node.eventListeners[key] = [];
@@ -11888,7 +11888,7 @@ var Konva = {};
var AUTO = 'auto', var AUTO = 'auto',
//CANVAS = 'canvas', //CANVAS = 'canvas',
CENTER = 'center', CENTER = 'center',
CHANGE_KINETIC = 'Change.konva', CHANGE_KONVA = 'Change.konva',
CONTEXT_2D = '2d', CONTEXT_2D = '2d',
DASH = '-', DASH = '-',
EMPTY_STRING = '', EMPTY_STRING = '',
@@ -12047,7 +12047,7 @@ var Konva = {};
// update text data for certain attr changes // update text data for certain attr changes
for(var n = 0; n < attrChangeListLen; n++) { for(var n = 0; n < attrChangeListLen; n++) {
this.on(ATTR_CHANGE_LIST[n] + CHANGE_KINETIC, this._setTextData); this.on(ATTR_CHANGE_LIST[n] + CHANGE_KONVA, this._setTextData);
} }
this._setTextData(); this._setTextData();
@@ -14691,7 +14691,7 @@ var Konva = {};
;(function() { ;(function() {
// constants // constants
var ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'lineHeight', 'text'], var ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'lineHeight', 'text'],
CHANGE_KINETIC = 'Change.konva', CHANGE_KONVA = 'Change.konva',
NONE = 'none', NONE = 'none',
UP = 'up', UP = 'up',
RIGHT = 'right', RIGHT = 'right',
@@ -14804,7 +14804,7 @@ var Konva = {};
// update text data for certain attr changes // update text data for certain attr changes
for(n = 0; n < attrChangeListLen; n++) { for(n = 0; n < attrChangeListLen; n++) {
text.on(ATTR_CHANGE_LIST[n] + CHANGE_KINETIC, func); text.on(ATTR_CHANGE_LIST[n] + CHANGE_KONVA, func);
} }
}, },
getWidth: function() { getWidth: function() {

4
src/Node.js
View File

@@ -8,7 +8,7 @@
EMPTY_STRING = '', EMPTY_STRING = '',
GET = 'get', GET = 'get',
ID = 'id', ID = 'id',
KINETIC = 'konva', KONVA = 'konva',
LISTENING = 'listening', LISTENING = 'listening',
MOUSEENTER = 'mouseenter', MOUSEENTER = 'mouseenter',
MOUSELEAVE = 'mouseleave', MOUSELEAVE = 'mouseleave',
@@ -1254,7 +1254,7 @@
* don't include konva namespaced listeners because * don't include konva namespaced listeners because
* these are generated by the constructors * these are generated by the constructors
*/ */
if(listener.name.indexOf(KINETIC) < 0) { if(listener.name.indexOf(KONVA) < 0) {
// if listeners array doesn't exist, then create it // if listeners array doesn't exist, then create it
if(!node.eventListeners[key]) { if(!node.eventListeners[key]) {
node.eventListeners[key] = []; node.eventListeners[key] = [];

8
src/Util.js
View File

@@ -301,8 +301,8 @@
HASH = '#', HASH = '#',
EMPTY_STRING = '', EMPTY_STRING = '',
ZERO = '0', ZERO = '0',
KINETIC_WARNING = 'Konva warning: ', KONVA_WARNING = 'Konva warning: ',
KINETIC_ERROR = 'Konva error: ', KONVA_ERROR = 'Konva error: ',
RGB_PAREN = 'rgb(', RGB_PAREN = 'rgb(',
COLORS = { COLORS = {
aqua: [0,255,255], aqua: [0,255,255],
@@ -622,7 +622,7 @@
return str.charAt(0).toUpperCase() + str.slice(1); return str.charAt(0).toUpperCase() + str.slice(1);
}, },
error: function(str) { error: function(str) {
throw new Error(KINETIC_ERROR + str); throw new Error(KONVA_ERROR + str);
}, },
warn: function(str) { warn: function(str) {
/* /*
@@ -630,7 +630,7 @@
* if we don't use window.console in the conditional * if we don't use window.console in the conditional
*/ */
if(Konva.root.console && console.warn && Konva.showWarnings) { if(Konva.root.console && console.warn && Konva.showWarnings) {
console.warn(KINETIC_WARNING + str); console.warn(KONVA_WARNING + str);
} }
}, },
extend: function(child, parent) { extend: function(child, parent) {

4
src/plugins/Label.js
View File

@@ -1,7 +1,7 @@
(function() { (function() {
// constants // constants
var ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'lineHeight', 'text'], var ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'lineHeight', 'text'],
CHANGE_KINETIC = 'Change.konva', CHANGE_KONVA = 'Change.konva',
NONE = 'none', NONE = 'none',
UP = 'up', UP = 'up',
RIGHT = 'right', RIGHT = 'right',
@@ -95,7 +95,7 @@
// update text data for certain attr changes // update text data for certain attr changes
for(n = 0; n < attrChangeListLen; n++) { for(n = 0; n < attrChangeListLen; n++) {
text.on(ATTR_CHANGE_LIST[n] + CHANGE_KINETIC, func); text.on(ATTR_CHANGE_LIST[n] + CHANGE_KONVA, func);
} }
}, },
getWidth: function() { getWidth: function() {

4
src/shapes/Text.js
View File

@@ -3,7 +3,7 @@
var AUTO = 'auto', var AUTO = 'auto',
//CANVAS = 'canvas', //CANVAS = 'canvas',
CENTER = 'center', CENTER = 'center',
CHANGE_KINETIC = 'Change.konva', CHANGE_KONVA = 'Change.konva',
CONTEXT_2D = '2d', CONTEXT_2D = '2d',
DASH = '-', DASH = '-',
EMPTY_STRING = '', EMPTY_STRING = '',
@@ -84,7 +84,7 @@
// update text data for certain attr changes // update text data for certain attr changes
for(var n = 0; n < attrChangeListLen; n++) { for(var n = 0; n < attrChangeListLen; n++) {
this.on(ATTR_CHANGE_LIST[n] + CHANGE_KINETIC, this._setTextData); this.on(ATTR_CHANGE_LIST[n] + CHANGE_KONVA, this._setTextData);
} }
this._setTextData(); this._setTextData();