Fixes to merged pull requests

holiveros · Feb 17, 2013 · fa6ea62 · fa6ea62
1 parent 2929bfd
commit fa6ea62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/make b/make
@@ -10,15 +10,13 @@ var ujs = require('uglify-js'),
 	},
 	output = {
 		'raphael-min.js'     : ['eve', 'core', 'svg', 'vml'],
-		'raphael.js'         : ['eve', 'core', 'svg', 'vml'],
-		'raphael.pro-min.js' : ['eve', 'core', 'svg'],
-		'raphael.pro.js'     : ['eve', 'core', 'svg'],
+		'raphael.js'         : ['eve', 'core', 'svg', 'vml']
 	};
 
 for (var file in input) {
 	input[file] = fs.readFileSync(input[file], 'utf8');
 }
-for (var file in output) {
+for (file in output) {
 	var out = '';
 	if (file.indexOf('min') !== -1) {
 		console.log('Compressing ' + file);
@@ -30,7 +28,7 @@ for (var file in output) {
 		}
 	} else {
 		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';
 		}
 	}

diff --git a/raphael.core.js b/raphael.core.js
@@ -3086,7 +3086,7 @@
      = (object) data
     \*/
     elproto.getData = function () {
-        return eldata[this.id] || {};
+        return clone(eldata[this.id] || {});
     };
     /*\
      * Element.hover
@@ -3513,13 +3513,13 @@
      **
      > Parameters
      **
-     - bbox (string) bbox to check with
+     - bbox (object) bbox to check with
      = (object) @Set
      \*/
     paperproto.getElementsByBBox = function (bbox) {
         var set = this.set();
         this.forEach(function (el) {
-            if (Raphael.isBBoxIntersect(el.getBBox(), bbox)) {
+            if (R.isBBoxIntersect(el.getBBox(), bbox)) {
                 set.push(el);
             }
         });