Commit fa6ea627 by Dmitry Baranovskiy

Fixes to merged pull requests

parent 2929bfdf
...@@ -10,15 +10,13 @@ var ujs = require('uglify-js'), ...@@ -10,15 +10,13 @@ var ujs = require('uglify-js'),
}, },
output = { output = {
'raphael-min.js' : ['eve', 'core', 'svg', 'vml'], 'raphael-min.js' : ['eve', 'core', 'svg', 'vml'],
'raphael.js' : ['eve', 'core', 'svg', 'vml'], 'raphael.js' : ['eve', 'core', 'svg', 'vml']
'raphael.pro-min.js' : ['eve', 'core', 'svg'],
'raphael.pro.js' : ['eve', 'core', 'svg'],
}; };
for (var file in input) { for (var file in input) {
input[file] = fs.readFileSync(input[file], 'utf8'); input[file] = fs.readFileSync(input[file], 'utf8');
} }
for (var file in output) { for (file in output) {
var out = ''; var out = '';
if (file.indexOf('min') !== -1) { if (file.indexOf('min') !== -1) {
console.log('Compressing ' + file); console.log('Compressing ' + file);
...@@ -30,7 +28,7 @@ for (var file in output) { ...@@ -30,7 +28,7 @@ for (var file in output) {
} }
} else { } else {
console.log('Concatinating ' + file); console.log('Concatinating ' + file);
for (var i = 0, l = output[file].length; i < l; i++) { for (i = 0, l = output[file].length; i < l; i++) {
out += input[output[file][i]] + '\n'; out += input[output[file][i]] + '\n';
} }
} }
......
...@@ -3086,7 +3086,7 @@ ...@@ -3086,7 +3086,7 @@
= (object) data = (object) data
\*/ \*/
elproto.getData = function () { elproto.getData = function () {
return eldata[this.id] || {}; return clone(eldata[this.id] || {});
}; };
/*\ /*\
* Element.hover * Element.hover
...@@ -3513,13 +3513,13 @@ ...@@ -3513,13 +3513,13 @@
** **
> Parameters > Parameters
** **
- bbox (string) bbox to check with - bbox (object) bbox to check with
= (object) @Set = (object) @Set
\*/ \*/
paperproto.getElementsByBBox = function (bbox) { paperproto.getElementsByBBox = function (bbox) {
var set = this.set(); var set = this.set();
this.forEach(function (el) { this.forEach(function (el) {
if (Raphael.isBBoxIntersect(el.getBBox(), bbox)) { if (R.isBBoxIntersect(el.getBBox(), bbox)) {
set.push(el); set.push(el);
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment