fullscreen/ImageReadr
0
0
Fork 0
mirror of https://github.com/FullScreenShenanigans/ImageReadr.git synced 2026-08-12 02:18:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed TypeScript errors

Browse Source 
It all works now.
This commit is contained in:
Josh Goldberg
2015-06-29 17:28:01 -04:00
parent 82281e198a
commit e4e4b30a62
6 changed files with 337 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/ImageReadr.d.ts
Vendored
+4
View File
@@ -1,6 +1,10 @@
/// <reference path="References/PixelRendr-0.2.0.ts" />
declare module ImageReadr {
export interface IWorkerHTMLElement extends HTMLElement {
workerCallback?: (...args: any[]) => void;
}
export interface IImageReadrSettings {
allowedFiles: { [i: string]: boolean; };
sectionSelector: string;
Source/ImageReadr.ts
+11 -8
View File
@@ -58,6 +58,8 @@ module ImageReadr {
this.palette = settings.paletteDefault;
this.initializePalettes();
this.initializeInput(this.inputSelector);
}
@@ -143,7 +145,7 @@ module ImageReadr {
this.initializeClickInput(surround);
this.initializeDragInput(surround);
(surround.children[0]).workerCallback = this.workerPaletteUploaderStart.bind(this);
(<IWorkerHTMLElement>surround.children[0]).workerCallback = this.workerPaletteUploaderStart.bind(this);
surround.appendChild(label);
@@ -248,7 +250,7 @@ module ImageReadr {
private handleFileDrop(input: HTMLInputElement, event: DragEvent) {
var files: FileList = input.files || event.dataTransfer.files,
output: HTMLElement = <HTMLElement>document.querySelector(this.outputSelector),
elements = [],
elements: IWorkerHTMLElement[] = [],
file: File,
tag: string,
element: HTMLDivElement,
@@ -271,7 +273,7 @@ module ImageReadr {
continue;
}
elements.push(this.createWorkerElement(files[i], event.target));
elements.push(this.createWorkerElement(files[i], <IWorkerHTMLElement>event.target));
}
for (i = 0; i < elements.length; i += 1) {
@@ -282,8 +284,8 @@ module ImageReadr {
/**
*
*/
private createWorkerElement(file: File, target: HTMLElement): HTMLDivElement {
var element: HTMLDivElement = document.createElement("div"),
private createWorkerElement(file: File, target: IWorkerHTMLElement): IWorkerHTMLElement {
var element: IWorkerHTMLElement = <IWorkerHTMLElement>document.createElement("div"),
reader = new FileReader();
element.workerCallback = target.workerCallback;
@@ -316,8 +318,9 @@ module ImageReadr {
*
*
*/
private workerTryStartWorking(file: File, element: HTMLElement, event: ProgressEvent): void {
var result = event.currentTarget.result;
private workerTryStartWorking(file: File, element: IWorkerHTMLElement, event: ProgressEvent): void {
var result = (<any>event.currentTarget).result;
console.log("Result is", result);
if (element.workerCallback) {
element.workerCallback(result, file, element, event);
@@ -409,7 +412,7 @@ module ImageReadr {
*/
private workerPaletteCollect(image, file, element, src, event) {
var canvas = document.createElement("canvas"),
context = canvas.getContext("2d"),
context: CanvasRenderingContext2D = <CanvasRenderingContext2D>canvas.getContext("2d"),
data;
canvas.width = image.width;
Source/References/ChangeLinr-0.2.0.js
-144
View File
@@ -1,144 +0,0 @@
var ChangeLinr;
(function (ChangeLinr_1) {
"use strict";
/**
* A general utility for transforming raw input to processed output. This is
* done by keeping an Array of transform Functions to process input on.
* Outcomes for inputs are cached so repeat runs are O(1).
*/
var ChangeLinr = (function () {
/**
* @param {IChangeLinrSettings} settings
*/
function ChangeLinr(settings) {
var i;
if (typeof settings.pipeline === "undefined") {
throw new Error("No pipeline given to ChangeLinr.");
}
this.pipeline = settings.pipeline || [];
if (typeof settings.transforms === "undefined") {
throw new Error("No transforms given to ChangeLinr.");
}
this.transforms = settings.transforms || {};
this.doMakeCache = typeof settings.doMakeCache === "undefined"
? true : settings.doMakeCache;
this.doUseCache = typeof settings.doUseCache === "undefined"
? true : settings.doUseCache;
this.cache = {};
this.cacheFull = {};
// Ensure the pipeline is formatted correctly
for (i = 0; i < this.pipeline.length; ++i) {
// Don't allow null/false transforms
if (!this.pipeline[i]) {
throw new Error("Pipe[" + i + "] is invalid.");
}
// Make sure each part of the pipeline exists
if (!this.transforms.hasOwnProperty(this.pipeline[i])) {
if (!this.transforms.hasOwnProperty(this.pipeline[i])) {
throw new Error("Pipe[" + i + "] (\"" + this.pipeline[i] + "\") "
+ "not found in transforms.");
}
}
// Also make sure each part of the pipeline is a Function
if (!(this.transforms[this.pipeline[i]] instanceof Function)) {
throw new Error("Pipe[" + i + "] (\"" + this.pipeline[i] + "\") "
+ "is not a valid Function from transforms.");
}
this.cacheFull[i] = this.cacheFull[this.pipeline[i]] = {};
}
}
/* Simple gets
*/
/**
* @return {Mixed} The cached output of this.process and this.processFull.
*/
ChangeLinr.prototype.getCache = function () {
return this.cache;
};
/**
* @param {String} key The key under which the output was processed
* @return {Mixed} The cached output filed under the given key.
*/
ChangeLinr.prototype.getCached = function (key) {
return this.cache[key];
};
/**
* @return {Object} A complete listing of the cached outputs from all
* processed information, from each pipeline transform.
*/
ChangeLinr.prototype.getCacheFull = function () {
return this.cacheFull;
};
/**
* @return {Boolean} Whether the cache object is being kept.
*/
ChangeLinr.prototype.getDoMakeCache = function () {
return this.doMakeCache;
};
/**
* @return {Boolean} Whether previously cached output is being used in new
* process requests.
*/
ChangeLinr.prototype.getDoUseCache = function () {
return this.doUseCache;
};
/* Core processing
*/
/**
* Applies a series of transforms to input data. If doMakeCache is on, the
* outputs of this are stored in cache and cacheFull.
*
* @param {Mixed} data The data to be transformed.
* @param {String} [key] They key under which the data is to be stored.
* If needed but not provided, defaults to data.
* @param {Object} [attributes] Any extra attributes to be given to the
* transform Functions.
* @return {Mixed} The final output of the pipeline.
*/
ChangeLinr.prototype.process = function (data, key, attributes) {
if (key === void 0) { key = undefined; }
if (attributes === void 0) { attributes = undefined; }
var i;
if (typeof key === "undefined" && (this.doMakeCache || this.doUseCache)) {
key = data;
}
// If this keyed input was already processed, get that
if (this.doUseCache && this.cache.hasOwnProperty(key)) {
return this.cache[key];
}
// Apply (and optionally cache) each transform in order
for (i = 0; i < this.pipeline.length; ++i) {
data = this.transforms[this.pipeline[i]](data, key, attributes, this);
if (this.doMakeCache) {
this.cacheFull[this.pipeline[i]][key] = data;
}
}
if (this.doMakeCache) {
this.cache[key] = data;
}
return data;
};
/**
* A version of this.process that returns the complete output from each
* pipelined transform Function in an Object.
*
* @param {Mixed} data The data to be transformed.
* @param {String} [key] They key under which the data is to be stored.
* If needed but not provided, defaults to data.
* @param {Object} [attributes] Any extra attributes to be given to the
* transform Functions.
* @return {Object} The complete output of the transforms.
*/
ChangeLinr.prototype.processFull = function (raw, key, attributes) {
if (attributes === void 0) { attributes = undefined; }
var output = {}, i;
this.process(raw, key, attributes);
for (i = 0; i < this.pipeline.length; ++i) {
output[i] = output[this.pipeline[i]] = this.cacheFull[this.pipeline[i]][key];
}
return output;
};
return ChangeLinr;
})();
ChangeLinr_1.ChangeLinr = ChangeLinr;
})(ChangeLinr || (ChangeLinr = {}));
Source/References/PixelRendr-0.2.0.js
+322 -2
View File
@@ -1,5 +1,325 @@
/// <reference path="ChangeLinr-0.2.0.ts" />
/// <reference path="StringFilr-0.2.1.ts" />
var ChangeLinr;
(function (ChangeLinr_1) {
"use strict";
/**
* A general utility for transforming raw input to processed output. This is
* done by keeping an Array of transform Functions to process input on.
* Outcomes for inputs are cached so repeat runs are O(1).
*/
var ChangeLinr = (function () {
/**
* @param {IChangeLinrSettings} settings
*/
function ChangeLinr(settings) {
var i;
if (typeof settings.pipeline === "undefined") {
throw new Error("No pipeline given to ChangeLinr.");
}
this.pipeline = settings.pipeline || [];
if (typeof settings.transforms === "undefined") {
throw new Error("No transforms given to ChangeLinr.");
}
this.transforms = settings.transforms || {};
this.doMakeCache = typeof settings.doMakeCache === "undefined"
? true : settings.doMakeCache;
this.doUseCache = typeof settings.doUseCache === "undefined"
? true : settings.doUseCache;
this.cache = {};
this.cacheFull = {};
// Ensure the pipeline is formatted correctly
for (i = 0; i < this.pipeline.length; ++i) {
// Don't allow null/false transforms
if (!this.pipeline[i]) {
throw new Error("Pipe[" + i + "] is invalid.");
}
// Make sure each part of the pipeline exists
if (!this.transforms.hasOwnProperty(this.pipeline[i])) {
if (!this.transforms.hasOwnProperty(this.pipeline[i])) {
throw new Error("Pipe[" + i + "] (\"" + this.pipeline[i] + "\") "
+ "not found in transforms.");
}
}
// Also make sure each part of the pipeline is a Function
if (!(this.transforms[this.pipeline[i]] instanceof Function)) {
throw new Error("Pipe[" + i + "] (\"" + this.pipeline[i] + "\") "
+ "is not a valid Function from transforms.");
}
this.cacheFull[i] = this.cacheFull[this.pipeline[i]] = {};
}
}
/* Simple gets
*/
/**
* @return {Mixed} The cached output of this.process and this.processFull.
*/
ChangeLinr.prototype.getCache = function () {
return this.cache;
};
/**
* @param {String} key The key under which the output was processed
* @return {Mixed} The cached output filed under the given key.
*/
ChangeLinr.prototype.getCached = function (key) {
return this.cache[key];
};
/**
* @return {Object} A complete listing of the cached outputs from all
* processed information, from each pipeline transform.
*/
ChangeLinr.prototype.getCacheFull = function () {
return this.cacheFull;
};
/**
* @return {Boolean} Whether the cache object is being kept.
*/
ChangeLinr.prototype.getDoMakeCache = function () {
return this.doMakeCache;
};
/**
* @return {Boolean} Whether previously cached output is being used in new
* process requests.
*/
ChangeLinr.prototype.getDoUseCache = function () {
return this.doUseCache;
};
/* Core processing
*/
/**
* Applies a series of transforms to input data. If doMakeCache is on, the
* outputs of this are stored in cache and cacheFull.
*
* @param {Mixed} data The data to be transformed.
* @param {String} [key] They key under which the data is to be stored.
* If needed but not provided, defaults to data.
* @param {Object} [attributes] Any extra attributes to be given to the
* transform Functions.
* @return {Mixed} The final output of the pipeline.
*/
ChangeLinr.prototype.process = function (data, key, attributes) {
if (key === void 0) { key = undefined; }
if (attributes === void 0) { attributes = undefined; }
var i;
if (typeof key === "undefined" && (this.doMakeCache || this.doUseCache)) {
key = data;
}
// If this keyed input was already processed, get that
if (this.doUseCache && this.cache.hasOwnProperty(key)) {
return this.cache[key];
}
// Apply (and optionally cache) each transform in order
for (i = 0; i < this.pipeline.length; ++i) {
data = this.transforms[this.pipeline[i]](data, key, attributes, this);
if (this.doMakeCache) {
this.cacheFull[this.pipeline[i]][key] = data;
}
}
if (this.doMakeCache) {
this.cache[key] = data;
}
return data;
};
/**
* A version of this.process that returns the complete output from each
* pipelined transform Function in an Object.
*
* @param {Mixed} data The data to be transformed.
* @param {String} [key] They key under which the data is to be stored.
* If needed but not provided, defaults to data.
* @param {Object} [attributes] Any extra attributes to be given to the
* transform Functions.
* @return {Object} The complete output of the transforms.
*/
ChangeLinr.prototype.processFull = function (raw, key, attributes) {
if (attributes === void 0) { attributes = undefined; }
var output = {}, i;
this.process(raw, key, attributes);
for (i = 0; i < this.pipeline.length; ++i) {
output[i] = output[this.pipeline[i]] = this.cacheFull[this.pipeline[i]][key];
}
return output;
};
return ChangeLinr;
})();
ChangeLinr_1.ChangeLinr = ChangeLinr;
})(ChangeLinr || (ChangeLinr = {}));
var StringFilr;
(function (StringFilr_1) {
"use strict";
/**
* A general utility for retrieving data from an Object based on nested class
* names. You can think of the internal "library" Object as a tree structure,
* such that you can pass in a listing (in any order) of the path to data for
* retrieval.
*/
var StringFilr = (function () {
/**
* @param {IStringFilrSettings} settings
*/
function StringFilr(settings) {
if (!settings) {
throw new Error("No settings given to StringFilr.");
}
if (!settings.library) {
throw new Error("No library given to StringFilr.");
}
this.library = settings.library;
this.normal = settings.normal;
this.requireNormalKey = settings.requireNormalKey;
this.cache = {};
if (this.requireNormalKey) {
if (typeof this.normal === "undefined") {
throw new Error("StringFilr is given requireNormalKey, but no normal class.");
}
this.ensureLibraryNormal();
}
}
/**
* @return {Object} The base library of stored information.
*/
StringFilr.prototype.getLibrary = function () {
return this.library;
};
/**
* @return {String} The optional normal class String.
*/
StringFilr.prototype.getNormal = function () {
return this.normal;
};
/**
* @return {Object} The complete cache of cached output.
*/
StringFilr.prototype.getCache = function () {
return this.cache;
};
/**
* @return {Mixed} A cached value, if it exists/
*/
StringFilr.prototype.getCached = function (key) {
return this.cache[key];
};
/**
* Completely clears the cache Object.
*/
StringFilr.prototype.clearCache = function () {
this.cache = {};
};
/**
* Clears the cached entry for a key.
*
* @param {String} key
*/
StringFilr.prototype.clearCached = function (key) {
if (this.normal) {
key = key.replace(this.normal, "");
}
delete this.cache[key];
};
/**
* Retrieves the deepest matching data in the library for a key.
*
* @param {String} keyRaw
* @return {Mixed}
*/
StringFilr.prototype.get = function (keyRaw) {
var key, result;
if (this.normal) {
key = keyRaw.replace(this.normal, "");
}
else {
key = keyRaw;
}
// Quickly return a cached result if it exists
if (this.cache.hasOwnProperty(key)) {
return this.cache[key];
}
// Since no existed, it must be found deep within the library
result = this.followClass(key.split(/\s+/g), this.library);
this.cache[key] = this.cache[keyRaw] = result;
return result;
};
/**
* Utility helper to recursively check for tree branches in the library
* that don't have a key equal to the normal. For each sub-directory that
* is caught, the path to it is added to output.
*
* @param {Object} current The current location being searched within
* the library.
* @param {String} path The current path within the library.
* @param {String[]} output An Array of the String paths to parts that
* don't have a matching key.
* @return {String[]} output
*/
StringFilr.prototype.findLackingNormal = function (current, path, output) {
var i;
if (!current.hasOwnProperty(this.normal)) {
output.push(path);
}
if (typeof current[i] === "object") {
for (i in current) {
if (current.hasOwnProperty(i)) {
this.findLackingNormal(current[i], path + " " + i, output);
}
}
}
return output;
};
/**
* Utility function to follow a path into the library (this is the driver
* for searching into the library). For each available key, if it matches
* a key in current, it is removed from keys and recursion happens on the
* sub-directory in current.
*
* @param {String[]} keys The currently available keys to search within.
* @param {Object} current The current location being searched within
* the library.
* @return {Mixed} The most deeply matched part of the library.
*/
StringFilr.prototype.followClass = function (keys, current) {
var key, i;
// If keys runs out, we're done
if (!keys || !keys.length) {
return current;
}
// For each key in the current array...
for (i = 0; i < keys.length; i += 1) {
key = keys[i];
// ...if it matches, recurse on the other keys
if (current.hasOwnProperty(key)) {
keys.splice(i, 1);
return this.followClass(keys, current[key]);
}
}
// If no key matched, try the normal (default)
if (this.normal && current.hasOwnProperty(this.normal)) {
return this.followClass(keys, current[this.normal]);
}
// Nothing matches anything; we're done.
return current;
};
/**
* Driver for this.findLackingNormal. If library directories are found to
* not have a normal, it throws an error.
*/
StringFilr.prototype.ensureLibraryNormal = function () {
var caught = this.findLackingNormal(this.library, "base", []);
if (caught.length) {
throw new Error("Found " + caught.length + " library "
+ "sub-directories missing the normal: "
+ "\r\n " + caught.join("\r\n "));
}
};
return StringFilr;
})();
StringFilr_1.StringFilr = StringFilr;
})(StringFilr || (StringFilr = {}));
// @echo '/// <reference path="ChangeLinr-0.2.0.ts" />'
// @echo '/// <reference path="StringFilr-0.2.1.ts" />'
// @ifdef INCLUDE_DEFINITIONS
/// <reference path="References/ChangeLinr-0.2.0.ts" />
/// <reference path="References/StringFilr-0.2.1.ts" />
/// <reference path="PixelRendr.d.ts" />
// @endif
// @include ../Source/PixelRendr.d.ts
var PixelRendr;
(function (PixelRendr_1) {
"use strict";
Source/References/StringFilr-0.2.1.js
-170
View File
@@ -1,170 +0,0 @@
var StringFilr;
(function (StringFilr_1) {
"use strict";
/**
* A general utility for retrieving data from an Object based on nested class
* names. You can think of the internal "library" Object as a tree structure,
* such that you can pass in a listing (in any order) of the path to data for
* retrieval.
*/
var StringFilr = (function () {
/**
* @param {IStringFilrSettings} settings
*/
function StringFilr(settings) {
if (!settings) {
throw new Error("No settings given to StringFilr.");
}
if (!settings.library) {
throw new Error("No library given to StringFilr.");
}
this.library = settings.library;
this.normal = settings.normal;
this.requireNormalKey = settings.requireNormalKey;
this.cache = {};
if (this.requireNormalKey) {
if (typeof this.normal === "undefined") {
throw new Error("StringFilr is given requireNormalKey, but no normal class.");
}
this.ensureLibraryNormal();
}
}
/**
* @return {Object} The base library of stored information.
*/
StringFilr.prototype.getLibrary = function () {
return this.library;
};
/**
* @return {String} The optional normal class String.
*/
StringFilr.prototype.getNormal = function () {
return this.normal;
};
/**
* @return {Object} The complete cache of cached output.
*/
StringFilr.prototype.getCache = function () {
return this.cache;
};
/**
* @return {Mixed} A cached value, if it exists/
*/
StringFilr.prototype.getCached = function (key) {
return this.cache[key];
};
/**
* Completely clears the cache Object.
*/
StringFilr.prototype.clearCache = function () {
this.cache = {};
};
/**
* Clears the cached entry for a key.
*
* @param {String} key
*/
StringFilr.prototype.clearCached = function (key) {
if (this.normal) {
key = key.replace(this.normal, "");
}
delete this.cache[key];
};
/**
* Retrieves the deepest matching data in the library for a key.
*
* @param {String} keyRaw
* @return {Mixed}
*/
StringFilr.prototype.get = function (keyRaw) {
var key, result;
if (this.normal) {
key = keyRaw.replace(this.normal, "");
}
else {
key = keyRaw;
}
// Quickly return a cached result if it exists
if (this.cache.hasOwnProperty(key)) {
return this.cache[key];
}
// Since no existed, it must be found deep within the library
result = this.followClass(key.split(/\s+/g), this.library);
this.cache[key] = this.cache[keyRaw] = result;
return result;
};
/**
* Utility helper to recursively check for tree branches in the library
* that don't have a key equal to the normal. For each sub-directory that
* is caught, the path to it is added to output.
*
* @param {Object} current The current location being searched within
* the library.
* @param {String} path The current path within the library.
* @param {String[]} output An Array of the String paths to parts that
* don't have a matching key.
* @return {String[]} output
*/
StringFilr.prototype.findLackingNormal = function (current, path, output) {
var i;
if (!current.hasOwnProperty(this.normal)) {
output.push(path);
}
if (typeof current[i] === "object") {
for (i in current) {
if (current.hasOwnProperty(i)) {
this.findLackingNormal(current[i], path + " " + i, output);
}
}
}
return output;
};
/**
* Utility function to follow a path into the library (this is the driver
* for searching into the library). For each available key, if it matches
* a key in current, it is removed from keys and recursion happens on the
* sub-directory in current.
*
* @param {String[]} keys The currently available keys to search within.
* @param {Object} current The current location being searched within
* the library.
* @return {Mixed} The most deeply matched part of the library.
*/
StringFilr.prototype.followClass = function (keys, current) {
var key, i;
// If keys runs out, we're done
if (!keys || !keys.length) {
return current;
}
// For each key in the current array...
for (i = 0; i < keys.length; i += 1) {
key = keys[i];
// ...if it matches, recurse on the other keys
if (current.hasOwnProperty(key)) {
keys.splice(i, 1);
return this.followClass(keys, current[key]);
}
}
// If no key matched, try the normal (default)
if (this.normal && current.hasOwnProperty(this.normal)) {
return this.followClass(keys, current[this.normal]);
}
// Nothing matches anything; we're done.
return current;
};
/**
* Driver for this.findLackingNormal. If library directories are found to
* not have a normal, it throws an error.
*/
StringFilr.prototype.ensureLibraryNormal = function () {
var caught = this.findLackingNormal(this.library, "base", []);
if (caught.length) {
throw new Error("Found " + caught.length + " library "
+ "sub-directories missing the normal: "
+ "\r\n " + caught.join("\r\n "));
}
};
return StringFilr;
})();
StringFilr_1.StringFilr = StringFilr;
})(StringFilr || (StringFilr = {}));
Source/index.html
-1
View File
@@ -22,5 +22,4 @@
<script src="ImageReadr.js"></script>
<script src="index.js"></script>
</body>
</body>
</html>