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

set default pixelRatio for method

Browse Source
This commit is contained in:
Anton Lavrenov 2015-04-27 11:20:55 +07:00
parent 744dd61992
commit 3dff461592
4 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
konva.js
View File

@ -3,7 +3,7 @@
* Konva JavaScript Framework v0.9.5
* http://konvajs.github.io/
* Licensed under the MIT or GPL Version 2 licenses.
* Date: Sun Apr 26 2015
* Date: Mon Apr 27 2015
*
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
* Modified work Copyright (C) 2014 - 2015 by Anton Lavrenov (Konva)
@ -1095,18 +1095,20 @@ var Konva = {};
}
},
extend: function(child, parent) {
function Ctor() {
this.constructor = child;
}
function Ctor() {
this.constructor = child;
}
Ctor.prototype = parent.prototype;
var old_proto = child.prototype;
child.prototype = new Ctor();
for (var key in old_proto) {
if (old_proto.hasOwnProperty(key)) {
child.prototype[key] = old_proto[key];
}
var old_proto = child.prototype;
child.prototype = new Ctor();
for (var key in old_proto) {
if (old_proto.hasOwnProperty(key)) {
child.prototype[key] = old_proto[key];
}
child.__super__ = parent.prototype;
}
child.__super__ = parent.prototype;
// create reference to parent
child.super = parent;
},
/**
* adds methods to a constructor prototype
@ -1851,7 +1853,7 @@ var Konva = {};
grd.addColorStop(colorStops[n], colorStops[n + 1]);
}
this.setAttr('fillStyle', grd);
this.fill();
shape._fillFunc(this);
}
},
_fillRadialGradient: function(shape) {
@ -3475,8 +3477,7 @@ var Konva = {};
*/
clone: function(obj) {
// instantiate new node
var className = this.getClassName(),
attrs = Konva.Util.cloneObject(this.attrs),
var attrs = Konva.Util.cloneObject(this.attrs),
key, allListeners, len, n, listener;
// filter black attrs
for (var i in CLONE_BLACK_LIST) {
@ -3488,7 +3489,7 @@ var Konva = {};
attrs[key] = obj[key];
}
var node = new Konva[className](attrs);
var node = new this.constructor(attrs);
// copy over listeners
for(key in this.eventListeners) {
allListeners = this.eventListeners[key];
@ -3526,6 +3527,7 @@ var Konva = {};
* @param {Number} [config.quality] jpeg quality. If using an "image/jpeg" mimeType,
* you can specify the quality from 0 to 1, where 0 is very poor quality and 1
* is very high quality
* @paremt {Number} [config.pixelRatio] pixelRatio of ouput image url. Default is 1
* @returns {String}
*/
toDataURL: function(config) {
@ -3536,10 +3538,11 @@ var Konva = {};
stage = this.getStage(),
x = config.x || 0,
y = config.y || 0,
pixelRatio = config.pixelRatio || 1,
canvas = new Konva.SceneCanvas({
width: config.width || this.getWidth() || (stage ? stage.getWidth() : 0),
height: config.height || this.getHeight() || (stage ? stage.getHeight() : 0),
pixelRatio: config.pixelRatio
pixelRatio: pixelRatio
}),
context = canvas.getContext();
@ -3571,6 +3574,7 @@ var Konva = {};
* @param {Number} [config.quality] jpeg quality. If using an "image/jpeg" mimeType,
* you can specify the quality from 0 to 1, where 0 is very poor quality and 1
* is very high quality
* @paremt {Number} [config.pixelRatio] pixelRatio of ouput image. Default is 1.
* @example
* var image = node.toImage({
* callback: function(img) {
@ -3580,7 +3584,7 @@ var Konva = {};
*/
toImage: function(config) {
if (!config || !config.callback) {
throw "callback required for toImage method config argument";
throw 'callback required for toImage method config argument';
}
Konva.Util._getImage(this.toDataURL(config), function(img) {
config.callback(img);
@ -12747,8 +12751,12 @@ var Konva = {};
Konva.Text.prototype = {
___init: function(config) {
config = config || {};
config.fill = config.fill || 'black';
// set default color to black
if (!config.fillLinearGradientColorStops && !config.fillRadialGradientColorStops) {
config.fill = config.fill || 'black';
}
if (config.width === undefined) {
config.width = AUTO;
}

8
konva.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
src/Node.js
View File

@ -1327,8 +1327,7 @@
*/
clone: function(obj) {
// instantiate new node
var className = this.getClassName(),
attrs = Konva.Util.cloneObject(this.attrs),
var attrs = Konva.Util.cloneObject(this.attrs),
key, allListeners, len, n, listener;
// filter black attrs
for (var i in CLONE_BLACK_LIST) {
@ -1378,7 +1377,7 @@
* @param {Number} [config.quality] jpeg quality. If using an "image/jpeg" mimeType,
* you can specify the quality from 0 to 1, where 0 is very poor quality and 1
* is very high quality
* @paremt {Number} [config.pixelRatio] pixelRatio of ouput image url.
* @paremt {Number} [config.pixelRatio] pixelRatio of ouput image url. Default is 1
* @returns {String}
*/
toDataURL: function(config) {
@ -1389,10 +1388,11 @@
stage = this.getStage(),
x = config.x || 0,
y = config.y || 0,
pixelRatio = config.pixelRatio || 1,
canvas = new Konva.SceneCanvas({
width: config.width || this.getWidth() || (stage ? stage.getWidth() : 0),
height: config.height || this.getHeight() || (stage ? stage.getHeight() : 0),
pixelRatio: config.pixelRatio
pixelRatio: pixelRatio
}),
context = canvas.getContext();
@ -1424,7 +1424,7 @@
* @param {Number} [config.quality] jpeg quality. If using an "image/jpeg" mimeType,
* you can specify the quality from 0 to 1, where 0 is very poor quality and 1
* is very high quality
* @paremt {Number} [config.pixelRatio] pixelRatio of ouput image.
* @paremt {Number} [config.pixelRatio] pixelRatio of ouput image. Default is 1.
* @example
* var image = node.toImage({
* callback: function(img) {
@ -1434,7 +1434,7 @@
*/
toImage: function(config) {
if (!config || !config.callback) {
throw "callback required for toImage method config argument";
throw 'callback required for toImage method config argument';
}
Konva.Util._getImage(this.toDataURL(config), function(img) {
config.callback(img);

2
test/unit/Node-test.js
View File

@ -281,6 +281,7 @@ suite('Node', function() {
// ======================================================
test('toDataURL + HDPI', function(done) {
this.timeout(5000);
var oldRatio = Konva.pixelRatio;
Konva.pixelRatio = 2;
@ -301,6 +302,7 @@ suite('Node', function() {
stage.draw();
stage.toDataURL({
pixelRatio : 2,
callback : function(url) {
var img = new Image();
img.onload = function() {