Merge branch 'master' into feature-gif-export-panel

This commit is contained in:
Julian Descottes
2013-09-28 23:37:12 +02:00
21 changed files with 103 additions and 25 deletions

View File

@ -1,5 +1,5 @@
// TODO(grosbouddha): put under pskl namespace.
Events = {
var Events = {
TOOL_SELECTED : "TOOL_SELECTED",
TOOL_RELEASED : "TOOL_RELEASED",

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.BaseTool
*
* @require pskl.utils

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.Circle
*
* @require pskl.utils

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.ColorPicker
*
* @require pskl.utils

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.Eraser
*
* @require Constants

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.Move
*
* @require pskl.utils

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.PaintBucket
*
* @require pskl.utils

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.Rectangle
*
* @require pskl.utils

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.SimplePen
*
* @require pskl.utils

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.Stroke
*
* @require pskl.utils

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.BaseSelect
*
* @require pskl.utils

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.RectangleSelect
*
* @require pskl.utils

View File

@ -1,4 +1,4 @@
/*
/**
* @provide pskl.drawingtools.ShapeSelect
*
* @require pskl.utils

View File

@ -44,7 +44,7 @@
x0 : Math.min(x0, x1),
y0 : Math.min(y0, y1),
x1 : Math.max(x0, x1),
y1 : Math.max(y0, y1),
y1 : Math.max(y0, y1)
};
},
@ -172,6 +172,6 @@
widthBoundDpi = Math.floor(width / pictureWidth);
return Math.min(heightBoundDpi, widthBoundDpi);
},
}
};
})();

View File

@ -24,7 +24,7 @@ if (typeof Function.prototype.bind !== "function") {
};
}
/*
/**
* @provide pskl.utils
*
* @require Constants