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

removed unecessary regex in Class file which was tripping up the JS minifier

Browse Source
This commit is contained in:
Eric Rowell 2012-07-11 22:55:18 -07:00
parent 780d5568db
commit d4f03e64b1
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/kinetic-core.js vendored
View File

@ -3,7 +3,7 @@
* http://www.kineticjs.com/ * http://www.kineticjs.com/
* Copyright 2012, Eric Rowell * Copyright 2012, Eric Rowell
* Licensed under the MIT or GPL Version 2 licenses. * Licensed under the MIT or GPL Version 2 licenses.
* Date: Jul 08 2012 * Date: Jul 11 2012
* *
* Copyright (C) 2011 - 2012 by Eric Rowell * Copyright (C) 2011 - 2012 by Eric Rowell
* *
@ -281,8 +281,7 @@ Kinetic.Type = {
*/ */
// Inspired by base2 and Prototype // Inspired by base2 and Prototype
(function() { (function() {
var initializing = false, fnTest = /xyz/.test(function() { xyz; var initializing = false;
}) ? /\b_super\b/ : /.*/;
// The base Class implementation (does nothing) // The base Class implementation (does nothing)
Kinetic.Class = function() { Kinetic.Class = function() {
}; };
@ -299,7 +298,7 @@ Kinetic.Type = {
// Copy the properties over onto the new prototype // Copy the properties over onto the new prototype
for(var name in prop) { for(var name in prop) {
// Check if we're overwriting an existing function // Check if we're overwriting an existing function
prototype[name] = typeof prop[name] == "function" && typeof _super[name] == "function" && fnTest.test(prop[name]) ? (function(name, fn) { prototype[name] = typeof prop[name] == "function" && typeof _super[name] == "function" ? (function(name, fn) {
return function() { return function() {
var tmp = this._super; var tmp = this._super;
@ -1783,7 +1782,6 @@ Kinetic.Container = Kinetic.Node.extend({
* animations * animations
* @constructor * @constructor
* @augments Kinetic.Container * @augments Kinetic.Container
* @augments Kinetic.Node
* @param {String|DomElement} cont Container id or DOM element * @param {String|DomElement} cont Container id or DOM element
* @param {int} width * @param {int} width
* @param {int} height * @param {int} height

7
dist/kinetic-core.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/Stage.js
View File

@ -6,7 +6,6 @@
* animations * animations
* @constructor * @constructor
* @augments Kinetic.Container * @augments Kinetic.Container
* @augments Kinetic.Node
* @param {String|DomElement} cont Container id or DOM element * @param {String|DomElement} cont Container id or DOM element
* @param {int} width * @param {int} width
* @param {int} height * @param {int} height

5
src/util/Class.js
View File

@ -7,8 +7,7 @@
*/ */
// Inspired by base2 and Prototype // Inspired by base2 and Prototype
(function() { (function() {
var initializing = false, fnTest = /xyz/.test(function() { xyz; var initializing = false;
}) ? /\b_super\b/ : /.*/;
// The base Class implementation (does nothing) // The base Class implementation (does nothing)
Kinetic.Class = function() { Kinetic.Class = function() {
}; };
@ -25,7 +24,7 @@
// Copy the properties over onto the new prototype // Copy the properties over onto the new prototype
for(var name in prop) { for(var name in prop) {
// Check if we're overwriting an existing function // Check if we're overwriting an existing function
prototype[name] = typeof prop[name] == "function" && typeof _super[name] == "function" && fnTest.test(prop[name]) ? (function(name, fn) { prototype[name] = typeof prop[name] == "function" && typeof _super[name] == "function" ? (function(name, fn) {
return function() { return function() {
var tmp = this._super; var tmp = this._super;

2
tests/html/unitTests.html
View File

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<link rel="stylesheet" type="text/css"href="../base.css"> <link rel="stylesheet" type="text/css"href="../base.css">
<script src="../../dist/kinetic-core.js"></script> <script src="../../dist/kinetic-core.min.js"></script>
<script src="../assets/worldMap.js"></script> <script src="../assets/worldMap.js"></script>
<script src="../assets/tiger.js"></script> <script src="../assets/tiger.js"></script>
<script src="../assets/unitDataUrls.js"></script> <script src="../assets/unitDataUrls.js"></script>