conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
},
{
name: "Janis",
size: "1.2k",
tags: ["animation", "ui", "transitions"],
description: "A simple CSS Transitions animation framework",
url: "http://mikemctiernan.github.com/Janis/",
source: "https://github.com/MikeMcTiernan/Janis/raw/master/janis.js"
=======
},
{
name: "extend.js",
size: "0.6k",
tags: ["namespace", "extend"],
description: "A simple way to define and extend namespaces",
url: "https://github.com/searls/extend.js",
source: "https://github.com/searls/extend.js/raw/master/lib/extend.0.0.1.min.js"
>>>>>>>
},
{
name: "Janis",
size: "1.2k",
tags: ["animation", "ui", "transitions"],
description: "A simple CSS Transitions animation framework",
url: "http://mikemctiernan.github.com/Janis/",
source: "https://github.com/MikeMcTiernan/Janis/raw/master/janis.js"
},
{
name: "extend.js",
size: "0.6k",
tags: ["namespace", "extend"],
description: "A simple way to define and extend namespaces",
url: "https://github.com/searls/extend.js",
source: "https://github.com/searls/extend.js/raw/master/lib/extend.0.0.1.min.js" |
<<<<<<<
},
{
name: "ajax",
tags: ["ajax", "jquery"],
description: "Standalone AJAX library inspired by jQuery/zepto",
url: "https://github.com/ForbesLindesay/ajax",
source: "https://component.jit.su/ForbesLindesay/ajax/download/latest.js"
},
{
name: "parsy",
tags: ["nodejs", "options", "parser"],
description: "Tiny command line options parser for node.js in CoffeeScript",
url: "https://github.com/dciccale/parsy",
source: "https://raw.github.com/dciccale/parsy/master/lib/parsy.js"
},
{
name: "Gator",
tags: ["dom", "events", "delegation"],
description: "Simple event delegation library",
url: "http://craig.is/riding/gators",
source: "https://raw.github.com/ccampbell/gator/master/gator.js"
},
{
name: "ioc.js",
github: "tgriesser/ioc.js",
tags: ["ioc", "service locator"],
description: "A small IoC service locator container.",
url: "https://github.com/tgriesser/ioc.js",
source: "https://raw.github.com/tgriesser/ioc.js/master/ioc.js"
},
{
name: "keymage",
tags: ["events"],
description: "Keyboard shortcuts handling with support for key sequences.",
url: "https://github.com/piranha/keymage",
source: "https://github.com/piranha/keymage/raw/master/keymage.js"
},
{
name: "Chic",
tags: ["class", "classes", "extend", "inheritance", "oop", "prototypal", "prototype"],
description: "Chic is an extremely simple class-like interface to JavaScript prototypal inheritance.",
url: "https://github.com/rowanmanning/chic",
source: "https://raw.github.com/rowanmanning/chic/master/lib/chic.js"
},
{
name: "Perms",
tags: ["permissions", "perms", "ls", "chmod", "unix"],
description: "Convert Unix style permissions to strings like ls (0755 => 'rwxr-xr-x')",
url: "https://github.com/bahamas10/node-perms",
source: "https://raw.github.com/bahamas10/node-perms/master/index.js"
},
{
name: "autocast",
tags: ["auto", "cast", "typecast", "convert"],
description: "Easily and automatically cast common datatypes in JavaScript",
url: "https://github.com/bahamas10/node-autocast",
source: "https://raw.github.com/bahamas10/node-autocast/master/index.js"
},
{
name: "range.js",
tags: ["range"],
description: "JavaScript's missing range function.",
url: "https://github.com/js-coder/range.js",
source: "https://raw.github.com/js-coder/range.js/master/lib/range.js"
},
{
name: "Strukt",
tags: ["utilities"],
description: "Ruby inspired Structs for JavaScript.",
url: "https://github.com/js-coder/Strukt",
source: "https://raw.github.com/js-coder/Strukt/master/lib/strukt.js"
},
{
name: "ipsum.js",
tags: ["content", "text", "helper", "tool", "developer tool"],
description: "Increases / decreases text quantity inside inline elements by pressing keys to check if the design can cope with different text length.",
url: "https://github.com/mdix/ipsum.js",
source: "https://raw.github.com/mdix/ipsum.js/master/ipsum.js"
},
{
name: "preloadimages.js",
tags: ["preload", "images", "asset"],
description: "Preload images and callback when they are all ready",
url: "https://github.com/bahamas10/preloadimages.js",
source: "https://raw.github.com/bahamas10/preloadimages.js/master/preloadimages.js"
=======
},
{
name: "cm.js",
tags: ["polyfill", "cookies", "json"],
description: "Manage cookies easily.",
url: "https://github.com/timseverien/cm.js",
source: "https://raw.github.com/timseverien/cm.js/master/cm.js"
>>>>>>>
},
{
name: "ajax",
tags: ["ajax", "jquery"],
description: "Standalone AJAX library inspired by jQuery/zepto",
url: "https://github.com/ForbesLindesay/ajax",
source: "https://component.jit.su/ForbesLindesay/ajax/download/latest.js"
},
{
name: "parsy",
tags: ["nodejs", "options", "parser"],
description: "Tiny command line options parser for node.js in CoffeeScript",
url: "https://github.com/dciccale/parsy",
source: "https://raw.github.com/dciccale/parsy/master/lib/parsy.js"
},
{
name: "Gator",
tags: ["dom", "events", "delegation"],
description: "Simple event delegation library",
url: "http://craig.is/riding/gators",
source: "https://raw.github.com/ccampbell/gator/master/gator.js"
},
{
name: "ioc.js",
github: "tgriesser/ioc.js",
tags: ["ioc", "service locator"],
description: "A small IoC service locator container.",
url: "https://github.com/tgriesser/ioc.js",
source: "https://raw.github.com/tgriesser/ioc.js/master/ioc.js"
},
{
name: "keymage",
tags: ["events"],
description: "Keyboard shortcuts handling with support for key sequences.",
url: "https://github.com/piranha/keymage",
source: "https://github.com/piranha/keymage/raw/master/keymage.js"
},
{
name: "Chic",
tags: ["class", "classes", "extend", "inheritance", "oop", "prototypal", "prototype"],
description: "Chic is an extremely simple class-like interface to JavaScript prototypal inheritance.",
url: "https://github.com/rowanmanning/chic",
source: "https://raw.github.com/rowanmanning/chic/master/lib/chic.js"
},
{
name: "Perms",
tags: ["permissions", "perms", "ls", "chmod", "unix"],
description: "Convert Unix style permissions to strings like ls (0755 => 'rwxr-xr-x')",
url: "https://github.com/bahamas10/node-perms",
source: "https://raw.github.com/bahamas10/node-perms/master/index.js"
},
{
name: "autocast",
tags: ["auto", "cast", "typecast", "convert"],
description: "Easily and automatically cast common datatypes in JavaScript",
url: "https://github.com/bahamas10/node-autocast",
source: "https://raw.github.com/bahamas10/node-autocast/master/index.js"
},
{
name: "range.js",
tags: ["range"],
description: "JavaScript's missing range function.",
url: "https://github.com/js-coder/range.js",
source: "https://raw.github.com/js-coder/range.js/master/lib/range.js"
},
{
name: "Strukt",
tags: ["utilities"],
description: "Ruby inspired Structs for JavaScript.",
url: "https://github.com/js-coder/Strukt",
source: "https://raw.github.com/js-coder/Strukt/master/lib/strukt.js"
},
{
name: "ipsum.js",
tags: ["content", "text", "helper", "tool", "developer tool"],
description: "Increases / decreases text quantity inside inline elements by pressing keys to check if the design can cope with different text length.",
url: "https://github.com/mdix/ipsum.js",
source: "https://raw.github.com/mdix/ipsum.js/master/ipsum.js"
},
{
name: "preloadimages.js",
tags: ["preload", "images", "asset"],
description: "Preload images and callback when they are all ready",
url: "https://github.com/bahamas10/preloadimages.js",
source: "https://raw.github.com/bahamas10/preloadimages.js/master/preloadimages.js"
},
{
name: "cm.js",
tags: ["polyfill", "cookies", "json"],
description: "Manage cookies easily.",
url: "https://github.com/timseverien/cm.js",
source: "https://raw.github.com/timseverien/cm.js/master/cm.js" |
<<<<<<<
url: "http://caolan.github.com/nimble/",
source: "https://github.com/caolan/nimble/raw/master/nimble.min.js"
},
{
name: "loom",
size: "0.5k",
tags: ["functional"],
description: "A simple, four method API for differential inheritance and AOP.",
url: "https://github.com/rpflorence/loom",
source: "https://github.com/rpflorence/loom/blob/master/src/loom.js"
=======
url: "http://caolan.github.com/nimble/"
},
{
name: "jWorkflow",
size: "0.7k",
tags: ["functional", "workflow", "async"],
description: "Simple, buildable, repeatable workflows for client or serverside javascript",
url: "http://github.com/tinyhippos/jWorkflow"
>>>>>>>
url: "http://caolan.github.com/nimble/",
source: "https://github.com/caolan/nimble/raw/master/nimble.min.js"
},
{
name: "loom",
size: "0.5k",
tags: ["functional"],
description: "A simple, four method API for differential inheritance and AOP.",
url: "https://github.com/rpflorence/loom",
source: "https://github.com/rpflorence/loom/blob/master/src/loom.js"
},
{
name: "jWorkflow",
size: "0.7k",
tags: ["functional", "workflow", "async"],
description: "Simple, buildable, repeatable workflows for client or serverside javascript",
url: "http://github.com/tinyhippos/jWorkflow" |
<<<<<<<
name: "store",
github: "nbubna/store",
tags: ["localStorage", "sessionStorage", "JSON", "namespace", "API", "extensible"],
description: "A better API for using localStorage and sessionStorage.",
url: "https://github.com/nbubna/store",
source: "https://raw.github.com/nbubna/store/master/dist/store2.js"
},
{
name: "Oboe.js",
github: "jimhigson/oboe.js",
tags: ["ajax", "streaming", "download", "json", "parser", "sax", "jsonpath", "http"],
description: "Library for progressive parsing of ajax responses. Provides notification of objects found without waiting for the request to complete.",
url: "https://github.com/jimhigson/oboe.js",
source: "https://raw.github.com/jimhigson/oboe.js/master/dist/oboe.js"
},
{
name: "attach.js",
github: "nicbell/attach.js",
tags: ["dom", "instantiation", "attach", "javascript"],
description: "A DOM instantiation API designed to tidy up and encapsulate attaching JavaScript to the page.",
url: "http://nicbell.github.io/attach.js/",
source: "https://raw.github.com/nicbell/attach.js/master/attach.js"
},
{
name: "loglevel",
github: "pimterry/loglevel",
tags: ["log", "logging", "console"],
description: "Minimal lightweight logging for JavaScript, adding reliable log level methods to wrap any available console.log methods",
url: "https://github.com/pimterry/loglevel",
source: "https://raw.github.com/pimterry/loglevel/master/dist/loglevel.js"
},
{
=======
name: "goo.js",
github: "johnrobinsn/goo.js",
tags: ["HTML5", "canvas"],
description: "Microlibrary that makes it quick and easy to draw using the HTML5 Canvas API/",
url: "http://www.storminthecastle.com/projects/goo.js/",
source: "https://raw.github.com/johnrobinsn/goo.js/master/src/goo.js"
},
{
>>>>>>>
name: "store",
github: "nbubna/store",
tags: ["localStorage", "sessionStorage", "JSON", "namespace", "API", "extensible"],
description: "A better API for using localStorage and sessionStorage.",
url: "https://github.com/nbubna/store",
source: "https://raw.github.com/nbubna/store/master/dist/store2.js"
},
{
name: "Oboe.js",
github: "jimhigson/oboe.js",
tags: ["ajax", "streaming", "download", "json", "parser", "sax", "jsonpath", "http"],
description: "Library for progressive parsing of ajax responses. Provides notification of objects found without waiting for the request to complete.",
url: "https://github.com/jimhigson/oboe.js",
source: "https://raw.github.com/jimhigson/oboe.js/master/dist/oboe.js"
},
{
name: "attach.js",
github: "nicbell/attach.js",
tags: ["dom", "instantiation", "attach", "javascript"],
description: "A DOM instantiation API designed to tidy up and encapsulate attaching JavaScript to the page.",
url: "http://nicbell.github.io/attach.js/",
source: "https://raw.github.com/nicbell/attach.js/master/attach.js"
},
{
name: "loglevel",
github: "pimterry/loglevel",
tags: ["log", "logging", "console"],
description: "Minimal lightweight logging for JavaScript, adding reliable log level methods to wrap any available console.log methods",
url: "https://github.com/pimterry/loglevel",
source: "https://raw.github.com/pimterry/loglevel/master/dist/loglevel.js"
},
{
name: "goo.js",
github: "johnrobinsn/goo.js",
tags: ["HTML5", "canvas"],
description: "Microlibrary that makes it quick and easy to draw using the HTML5 Canvas API/",
url: "http://www.storminthecastle.com/projects/goo.js/",
source: "https://raw.github.com/johnrobinsn/goo.js/master/src/goo.js"
},
{ |
<<<<<<<
},
{
name: "Pledges",
tags: ["promise", "pledge"],
description: "A JavaScript micro-library that provides promise functionality.",
url: "https://github.com/ryansmith94/Pledges",
source: "https://raw.github.com/ryansmith94/Pledges/master/src/core.js"
=======
},
{
name: "SVGEventListener",
github: "madsgraphics/SVGEventListener",
tags: ["svg", "events", "animation", "polyfill"],
description: "A polyfill for animate events on SVG on non-supported browsers, like webkit engines",
url: "https://github.com/madsgraphics/SVGEventListener",
source: "https://raw.github.com/madsgraphics/SVGEventListener/master/SVGEventListener.js"
>>>>>>>
},
{
name: "Pledges",
tags: ["promise", "pledge"],
description: "A JavaScript micro-library that provides promise functionality.",
url: "https://github.com/ryansmith94/Pledges",
source: "https://raw.github.com/ryansmith94/Pledges/master/src/core.js"
},
{
name: "SVGEventListener",
github: "madsgraphics/SVGEventListener",
tags: ["svg", "events", "animation", "polyfill"],
description: "A polyfill for animate events on SVG on non-supported browsers, like webkit engines",
url: "https://github.com/madsgraphics/SVGEventListener",
source: "https://raw.github.com/madsgraphics/SVGEventListener/master/SVGEventListener.js" |
<<<<<<<
},
{
<<<<<<< HEAD
<<<<<<< HEAD
name: "PinkySwear.js",
tags: ["promises"],
description: "A tiny implementation of the Promises/A+ specification.",
url: "https://github.com/timjansen/pinkyswear.js",
source: "https://raw.github.com/timjansen/PinkySwear.js/master/pinkyswear.js"
},
{
name: "depot.js",
tags: ["storage", "localStorage", "store"],
description: "depot.js is a namespaced localStorage wrapper with a simple API.",
url: "https://github.com/mkuklis/depot.js",
source: "https://raw.github.com/mkuklis/depot.js/master/depot.js"
},
{
name: "DCL.js",
tags: ["class", "oop", "aop", "inheritance", "object", "compose"],
description: "An elegant OOP with mixins + AOP for JavaScript",
url: "http://www.dcljs.org/",
source: "https://raw.github.com/uhop/dcl/master/dcl.js"
},
{
name: "breakup.js",
tags: ["enumeration", "setimmediate", "enumerate", "jquery", "yield"],
description: "Yielding enumeration replacement functions for async.forEachSeries() and jQuery.each()",
url: "https://github.com/nicjansma/breakup.js",
source: "https://raw.github.com/nicjansma/breakup.js/master/lib/breakup.js"
},
{
name: "Barman",
tags: ["traits", "oop", "classes", "objects", "object composition"],
description: "A small library to brew JavaScript objects.",
url: "https://github.com/dfernandez79/barman",
source: "https://raw.github.com/dfernandez79/barman/master/src/barman.js"
},
{
name: "smoothScroll.js",
tags: ["scroll", "smooth"],
description: "A teeny tiny, ease-in-out, smooth scroll library with no dependency",
url: "https://github.com/alicelieutier/smoothScroll",
source: "https://raw.github.com/alicelieutier/smoothScroll/master/smoothscroll.js"
},
{
name: "strftime",
tags: ["strftime", "format", "date", "time"],
description: "strftime for JavaScript. Works in Node and browsers.",
url: "https://github.com/samsonjs/strftime",
source: "https://raw.github.com/samsonjs/strftime/master/strftime.js"
},
{
name: "format",
tags: ["format", "printf", "sprintf", "vsprintf", "string"],
description: "printf, sprintf, and vsprintf for JavaScript. Works in Node and browsers.",
url: "https://github.com/samsonjs/format",
source: "https://raw.github.com/samsonjs/format/master/format.js"
=======
},
{
name: "Proclaim",
tags: ["assert", "test"],
description: "A simple assertion library for server and client side JavaScript.",
url: "https://github.com/rowanmanning/proclaim",
source: "https://raw.github.com/rowanmanning/proclaim/master/lib/proclaim.js"
>>>>>>>
},
{
name: "PinkySwear.js",
tags: ["promises"],
description: "A tiny implementation of the Promises/A+ specification.",
url: "https://github.com/timjansen/pinkyswear.js",
source: "https://raw.github.com/timjansen/PinkySwear.js/master/pinkyswear.js"
},
{
name: "depot.js",
tags: ["storage", "localStorage", "store"],
description: "depot.js is a namespaced localStorage wrapper with a simple API.",
url: "https://github.com/mkuklis/depot.js",
source: "https://raw.github.com/mkuklis/depot.js/master/depot.js"
},
{
name: "DCL.js",
tags: ["class", "oop", "aop", "inheritance", "object", "compose"],
description: "An elegant OOP with mixins + AOP for JavaScript",
url: "http://www.dcljs.org/",
source: "https://raw.github.com/uhop/dcl/master/dcl.js"
},
{
name: "breakup.js",
tags: ["enumeration", "setimmediate", "enumerate", "jquery", "yield"],
description: "Yielding enumeration replacement functions for async.forEachSeries() and jQuery.each()",
url: "https://github.com/nicjansma/breakup.js",
source: "https://raw.github.com/nicjansma/breakup.js/master/lib/breakup.js"
},
{
name: "Barman",
tags: ["traits", "oop", "classes", "objects", "object composition"],
description: "A small library to brew JavaScript objects.",
url: "https://github.com/dfernandez79/barman",
source: "https://raw.github.com/dfernandez79/barman/master/src/barman.js"
},
{
name: "smoothScroll.js",
tags: ["scroll", "smooth"],
description: "A teeny tiny, ease-in-out, smooth scroll library with no dependency",
url: "https://github.com/alicelieutier/smoothScroll",
source: "https://raw.github.com/alicelieutier/smoothScroll/master/smoothscroll.js"
},
{
name: "strftime",
tags: ["strftime", "format", "date", "time"],
description: "strftime for JavaScript. Works in Node and browsers.",
url: "https://github.com/samsonjs/strftime",
source: "https://raw.github.com/samsonjs/strftime/master/strftime.js"
},
{
name: "format",
tags: ["format", "printf", "sprintf", "vsprintf", "string"],
description: "printf, sprintf, and vsprintf for JavaScript. Works in Node and browsers.",
url: "https://github.com/samsonjs/format",
source: "https://raw.github.com/samsonjs/format/master/format.js"
},
{
name: "Proclaim",
tags: ["assert", "test"],
description: "A simple assertion library for server and client side JavaScript.",
url: "https://github.com/rowanmanning/proclaim",
source: "https://raw.github.com/rowanmanning/proclaim/master/lib/proclaim.js" |
<<<<<<<
},
{
name: "preact",
github: "developit/preact",
tags: ["dom", "templating"],
description: "Tiny & fast Component-based Virtual DOM framework.",
url: "https://github.com/developit/preact",
source: "https://raw.githubusercontent.com/developit/preact/master/src/preact.js"
},
{
name: "smoke-signal",
github: "StephanHoyer/smoke-signal",
tags: ["pubsub", "event", "observer"],
description: "Simple small functional event observer for the browser and node.",
url: "https://github.com/StephanHoyer/smoke-signal",
source: "https://raw.githubusercontent.com/StephanHoyer/smoke-signal/master/index.js"
},
{
name: "min.css",
github: "w3core/min.css",
tags: ["minify", "css", "javascript", "nodejs", "fastest", "tiniest"],
description: "min.css is the tiniest, fastest and efficient JavaScript library for minifying CSS files. It works in node and the browser.",
url: "https://github.com/w3core/min.css",
source: "https://github.com/w3core/min.css/raw/master/min.css.js"
=======
},
{
name: "viiny-dragger",
github: "giraysam/viiny-dragger",
tags: ["viiny", "viiny-dragger", "drag and drop"],
description: "vinny-dragger is a drag and drop plugin for javascript.",
url: "http://giraysam.github.io/viiny-dragger/",
source: "https://github.com/giraysam/viiny-dragger/blob/master/src/index.js"
>>>>>>>
},
{
name: "preact",
github: "developit/preact",
tags: ["dom", "templating"],
description: "Tiny & fast Component-based Virtual DOM framework.",
url: "https://github.com/developit/preact",
source: "https://raw.githubusercontent.com/developit/preact/master/src/preact.js"
},
{
name: "smoke-signal",
github: "StephanHoyer/smoke-signal",
tags: ["pubsub", "event", "observer"],
description: "Simple small functional event observer for the browser and node.",
url: "https://github.com/StephanHoyer/smoke-signal",
source: "https://raw.githubusercontent.com/StephanHoyer/smoke-signal/master/index.js"
},
{
name: "min.css",
github: "w3core/min.css",
tags: ["minify", "css", "javascript", "nodejs", "fastest", "tiniest"],
description: "min.css is the tiniest, fastest and efficient JavaScript library for minifying CSS files. It works in node and the browser.",
url: "https://github.com/w3core/min.css",
source: "https://github.com/w3core/min.css/raw/master/min.css.js"
},
{
name: "viiny-dragger",
github: "giraysam/viiny-dragger",
tags: ["viiny", "viiny-dragger", "drag and drop"],
description: "vinny-dragger is a drag and drop plugin for javascript.",
url: "http://giraysam.github.io/viiny-dragger/",
source: "https://github.com/giraysam/viiny-dragger/blob/master/src/index.js" |
<<<<<<<
},
{
name: "Maybe",
github: "alexanderjarvis/maybes",
tags: ["maybe", "functional"],
description: "Maybe is a type that wraps optional values",
url: "https://github.com/alexanderjarvis/maybe",
source: "https://raw.githubusercontent.com/alexanderjarvis/maybe/master/src/maybe.js"
=======
},
{
name: "microBench",
github: "kmpatel/microBench",
tags: ["performance", "benchmark"],
description: "Tiny, simple framework to benchmark your JS functions in browser console",
url: "https://github.com/kmpatel/microBench/releases",
source: "https://raw.githubusercontent.com/kmpatel/microBench/v0.9/ubenchmark.js"
},
{
name: "Animatelo",
github: "gibbok/animatelo",
tags: ["animation", "animate", "web animation"],
description: "Animatelo is a bunch of cool, fun, and cross-browser animations for you to use in your projects. This is a porting to Web Animation API of the fabulous animate.css project.",
url: "https://gibbok.github.io/animatelo/",
source: "https://raw.githubusercontent.com/gibbok/animatelo/master/dist/animatelo.min.js"
},
{
name: "Picodom",
github: "picodom/picodom",
tags: ["virtual", "dom", "templating"],
description: "1kb JavaScript Virtual DOM builder and patch algorithm.",
url: "https://github.com/picodom/picodom",
source: "https://unpkg.com/picodom"
>>>>>>>
},
{
name: "Maybe",
github: "alexanderjarvis/maybes",
tags: ["maybe", "functional"],
description: "Maybe is a type that wraps optional values",
url: "https://github.com/alexanderjarvis/maybe",
source: "https://raw.githubusercontent.com/alexanderjarvis/maybe/master/src/maybe.js"
},
{
name: "microBench",
github: "kmpatel/microBench",
tags: ["performance", "benchmark"],
description: "Tiny, simple framework to benchmark your JS functions in browser console",
url: "https://github.com/kmpatel/microBench/releases",
source: "https://raw.githubusercontent.com/kmpatel/microBench/v0.9/ubenchmark.js"
},
{
name: "Animatelo",
github: "gibbok/animatelo",
tags: ["animation", "animate", "web animation"],
description: "Animatelo is a bunch of cool, fun, and cross-browser animations for you to use in your projects. This is a porting to Web Animation API of the fabulous animate.css project.",
url: "https://gibbok.github.io/animatelo/",
source: "https://raw.githubusercontent.com/gibbok/animatelo/master/dist/animatelo.min.js"
},
{
name: "Picodom",
github: "picodom/picodom",
tags: ["virtual", "dom", "templating"],
description: "1kb JavaScript Virtual DOM builder and patch algorithm.",
url: "https://github.com/picodom/picodom",
source: "https://unpkg.com/picodom" |
<<<<<<<
},
{
name: "audio-fx",
size: "1.2k",
tags: ["audio", "games"],
description: "A HTML5 Audio Library",
url: "https://github.com/jakesgordon/javascript-audio-fx",
source: "https://raw.github.com/jakesgordon/javascript-audio-fx/master/audio-fx.min.js"
},
{
name: "swipe",
size: "1.2k",
tags: ["jsanimation","mobile"],
description: "A lightweight 1-to-1 mobile slider. Optimized for touch devices.",
url: "https://github.com/bradbirdsall/Swipe",
source: "https://raw.github.com/bradbirdsall/Swipe/master/swipe.min.js"
},
{
name: "Happen",
size: "0.3k",
tags: ["events" ],
description: "General purpose event triggering",
url: "https://github.com/tmcw/happen",
source: "https://raw.github.com/tmcw/happen/master/src/happen.js"
},
{
name: "zest",
size: "2.2k",
tags: ["css", "selector", "dom"],
description: "An absurdly fast selector engine. Supports CSS3/CSS4 selectors - faster than Sizzle.",
url: "https://github.com/chjj/zest",
source: "https://raw.github.com/chjj/zest/master/lib/zest.js"
},
{
name: "Cookie Monster",
size: "0.7k",
tags: ["cookies", "data", "store"],
description: "A lightweight cookie library",
url: "https://github.com/jgallen23/cookie-monster",
source: "https://raw.github.com/jgallen23/cookie-monster/master/dist/monster.min.js"
},
{
name: "EditrJS",
size: "1.7k",
tags: ["manipulation","image", "editing"],
description: "A very simple image editing library with a chainable api.",
url: "https://github.com/narfdre/Editr",
source: "https://github.com/narfdre/Editr/blob/master/Editr.js"
},
{
name: "hsi.js",
size: "1.1k",
tags: ["color"],
description: "A small RGB <-> HSI converter.",
url: "https://github.com/e-/hsi.js",
source: "https://raw.github.com/e-/hsi.js/master/hsi.min.js"
},
{
name: "colorspaces.js",
size: "1.3k",
tags: ["color"],
description: "Convert between RGB and several CIE color spaces for smarter color manipulation.",
url: "http://boronine.github.com/colorspaces.js",
source: "https://raw.github.com/boronine/colorspaces.js/master/colorspaces.min.js"
},
{
name: "Fayer",
size: "0.9k",
tags: ["functional"],
description: "Easily kick-off page specific Javascript.",
url: "https://github.com/sandeepjain/fayer",
source: "https://raw.github.com/sandeepjain/fayer/master/src/fayer.min.js"
=======
},
{
name: "Supplement.js",
size: "1.4k",
tags: ["functional", "language", "data", "sugar"],
description: "A small collection of utility functions to make working with JavaScript that much sweeter and more expressive.",
url: "http://supplementjs.com"
>>>>>>>
},
{
name: "audio-fx",
size: "1.2k",
tags: ["audio", "games"],
description: "A HTML5 Audio Library",
url: "https://github.com/jakesgordon/javascript-audio-fx",
source: "https://raw.github.com/jakesgordon/javascript-audio-fx/master/audio-fx.min.js"
},
{
name: "swipe",
size: "1.2k",
tags: ["jsanimation","mobile"],
description: "A lightweight 1-to-1 mobile slider. Optimized for touch devices.",
url: "https://github.com/bradbirdsall/Swipe",
source: "https://raw.github.com/bradbirdsall/Swipe/master/swipe.min.js"
},
{
name: "Happen",
size: "0.3k",
tags: ["events" ],
description: "General purpose event triggering",
url: "https://github.com/tmcw/happen",
source: "https://raw.github.com/tmcw/happen/master/src/happen.js"
},
{
name: "zest",
size: "2.2k",
tags: ["css", "selector", "dom"],
description: "An absurdly fast selector engine. Supports CSS3/CSS4 selectors - faster than Sizzle.",
url: "https://github.com/chjj/zest",
source: "https://raw.github.com/chjj/zest/master/lib/zest.js"
},
{
name: "Cookie Monster",
size: "0.7k",
tags: ["cookies", "data", "store"],
description: "A lightweight cookie library",
url: "https://github.com/jgallen23/cookie-monster",
source: "https://raw.github.com/jgallen23/cookie-monster/master/dist/monster.min.js"
},
{
name: "EditrJS",
size: "1.7k",
tags: ["manipulation","image", "editing"],
description: "A very simple image editing library with a chainable api.",
url: "https://github.com/narfdre/Editr",
source: "https://github.com/narfdre/Editr/blob/master/Editr.js"
},
{
name: "hsi.js",
size: "1.1k",
tags: ["color"],
description: "A small RGB <-> HSI converter.",
url: "https://github.com/e-/hsi.js",
source: "https://raw.github.com/e-/hsi.js/master/hsi.min.js"
},
{
name: "colorspaces.js",
size: "1.3k",
tags: ["color"],
description: "Convert between RGB and several CIE color spaces for smarter color manipulation.",
url: "http://boronine.github.com/colorspaces.js",
source: "https://raw.github.com/boronine/colorspaces.js/master/colorspaces.min.js"
},
{
name: "Fayer",
size: "0.9k",
tags: ["functional"],
description: "Easily kick-off page specific Javascript.",
url: "https://github.com/sandeepjain/fayer",
source: "https://raw.github.com/sandeepjain/fayer/master/src/fayer.min.js"
},
{
name: "Supplement.js",
size: "1.4k",
tags: ["functional", "language", "data", "sugar"],
description: "A small collection of utility functions to make working with JavaScript that much sweeter and more expressive.",
url: "http://supplementjs.com" |
<<<<<<<
},
{
name: "keysort",
tags: ["array", "object", "sort", "keys", "sql", "where"],
description: "Sorts an Array of Objects with SQL ORDER BY clause",
url: "https://github.com/avoidwork/keysort",
source: "https://raw.github.com/avoidwork/keysort/master/lib/keysort.js"
},
{
name: "Lie",
tags: ["promise", "deferred","async"],
description: "A very small library for promises",
url: "https://github.com/calvinmetcalf/lie",
source: "https://raw.github.com/calvinmetcalf/lie/master/dist/lie.js"
},
{
name: "klud.js",
tags: ["testing", "unit test", "assert", "spy", "mock"],
description: "A minimal unit testing library.",
url: "https://bitbucket.org/zserge/klud.js/",
source: "https://bitbucket.org/zserge/klud.js/raw/default/klud.js"
},
{
name: "callbacks.js",
tags: ["callbacks", "events", "event manager"],
description: "Callbacks library similar to jQuery's Callbacks. There's also an event manager that allows you to use on(), one(), off() and trigger()",
url: "https://github.com/adrianmiu/callbacks",
source: "https://raw.github.com/adrianmiu/callbacks/master/src/callbacks.js"
},
{
name: "chronoman",
github: "gamtiq/chronoman",
tags: ["setTimeout", "setInterval", "timer", "timeout", "management", "utility"],
description: "Utility class to simplify use of timers created by setTimeout.",
url: "https://github.com/gamtiq/chronoman",
source: "https://raw.github.com/gamtiq/chronoman/master/dist/chronoman.js"
},
{
name: "basespace",
github: "gamtiq/basespace",
tags: ["namespace", "ns", "space", "object"],
description: "Functions to create namespaces inside objects.",
url: "https://github.com/gamtiq/basespace",
source: "https://raw.github.com/gamtiq/basespace/master/dist/basespace.js"
},
{
name: "mixing",
github: "gamtiq/mixing",
tags: ["mix", "merge", "mixin", "object"],
description: "Functions to mix objects.",
url: "https://github.com/gamtiq/mixing",
source: "https://raw.github.com/gamtiq/mixing/master/dist/mixing.js"
},
{
name: "extend",
github: "gamtiq/extend",
tags: ["extend", "inherit", "prototype", "inheritance", "class"],
description: "Make one class (constructor function) inherited from another.",
url: "https://github.com/gamtiq/extend",
source: "https://raw.github.com/gamtiq/extend/master/dist/extend.js"
},
{
name: "numgen",
github: "gamtiq/numgen",
tags: ["number", "sequence", "generator", "progression", "Fibonacci"],
description: "Creates objects that generate number sequences.",
url: "https://github.com/gamtiq/numgen",
source: "https://raw.github.com/gamtiq/numgen/master/dist/numgen.js"
},
{
name: "duratiform",
github: "gamtiq/duratiform",
tags: ["time", "duration", "divide", "separate", "decompose", "format", "millisecond"],
description: "Utility to separate into parts and to format time duration in milliseconds.",
url: "https://github.com/gamtiq/duratiform",
source: "https://raw.github.com/gamtiq/duratiform/master/dist/duratiform.js"
},
{
name: "easter.js",
tags: ["easter-egg", "keys", "sequence"],
description: "Easter eggs made easy.",
url: "https://github.com/rkrupinski/easter.js",
source: "https://raw.github.com/rkrupinski/easter.js/master/easter.js"
},
{
name: "henka",
tags: ["responsive", "respond", "media", "query", "media-query", "queries"],
description: "Light weight, portable, single purpose responsive javascript library.",
url: "https://github.com/toxigenicpoem/henka",
source: "https://raw.github.com/toxigenicpoem/henka/master/src/js/henka-src.js"
},
{
name: "rssi",
tags: ["interpolation", "string", "formatting", "template", "templating"],
description: "Ruby-like simple string interpolation for Node.js and browsers.",
url: "https://github.com/mvasilkov/rssi",
source: "https://raw.github.com/mvasilkov/rssi/master/rssi.js"
},
{
name: "trier.js",
tags: ["repeat", "retry", "predicate", "conditional", "invocation"],
description: "Because everyone loves a trier! Conditional and repeated task invocation for node and browser.",
url: "https://github.com/philbooth/trier.js",
source: "https://raw.github.com/philbooth/trier.js/master/src/trier.js"
},
{
name: "gameloop.js",
tags: ["games"],
description: "Very simple library to create game loop.",
url: "https://github.com/arthesowy/gameloop.js",
source: "https://raw.github.com/arthesowy/gameloop.js/master/gameloop.js"
},
{
name: "FastActive",
tags: ["events", "mobile", "touch"],
description: "FastActive is a javascript snippet that makes websites and web apps feel as responsive as native apps on touch devices.",
url: "https://github.com/jonathanstark/FastActive",
source: "https://raw.github.com/jonathanstark/FastActive/master/FastActive.js"
},
{
name: "JSONP",
tags: ["jsonp", "asynchronous", "async"],
description: "A slim JSONP request library for Javascript",
url: "https://github.com/larryosborn/JSONP",
source: "https://raw.github.com/larryosborn/JSONP/master/dist/jsonp.js"
},
{
name: "ResponsiveComments",
tags: ["responsive", "rwd", "conditional", "loading", "progressive", "enhancement"],
description: "A client-side solution to conditional loading.",
url: "http://responsivecomments.com/",
source: "https://raw.github.com/chambaz/ResponsiveComments/master/responsive-comments.js"
},
{
name: "Sparklines",
tags: ["sparkline", "sparklines", "tiny", "graph", "line", "spark", "chart"],
description: "Create sparkline graphs inline with the text. Good defaults, easy to customize.",
url: "https://github.com/mariusGundersen/sparkline",
source: "https://raw.github.com/mariusGundersen/sparkline/master/source/sparkline.js"
},
{
name: "YoutubeDelayed.js",
tags: ["youtube", "video", "loader"],
description: "A a small script which allows you to load youtube player on page only when the user wants to watch the video.",
url: "https://github.com/MAD-GooZe/YoutubeDelayed.js",
source: "https://raw2.github.com/MAD-GooZe/YoutubeDelayed.js/master/YoutubeDelayed.js"
},
{
name: "Riot",
tags: ["router", "event handling", "template engine", "mvp", "framework", "fast", "tiny"],
description: "The 1kb client-side MVP library. An incredibly fast, powerful yet tiny tool for building large scale web applications.",
url: "https://moot.it/riotjs/",
source: "https://raw2.github.com/moot/riotjs/master/riot.js"
},
{
name: "Contra",
tags: ["async", "asynchronous", "flow", "events", "callbacks", "queue"],
description: "Tiny asynchronous flow control library.",
url: "https://github.com/bevacqua/contra",
source: "https://raw.github.com/bevacqua/contra/master/dist/contra.js"
=======
},
{
name: "preloadr.js",
tags: ["preload", "images"],
description: "Preload images, one after another if needed and callback when every image is ready and/or all of them",
url: "https://github.com/borisschapira/preloadr",
source: "https://raw.github.com/borisschapira/preloadr/master/preloadr.js"
>>>>>>>
},
{
name: "keysort",
tags: ["array", "object", "sort", "keys", "sql", "where"],
description: "Sorts an Array of Objects with SQL ORDER BY clause",
url: "https://github.com/avoidwork/keysort",
source: "https://raw.github.com/avoidwork/keysort/master/lib/keysort.js"
},
{
name: "Lie",
tags: ["promise", "deferred","async"],
description: "A very small library for promises",
url: "https://github.com/calvinmetcalf/lie",
source: "https://raw.github.com/calvinmetcalf/lie/master/dist/lie.js"
},
{
name: "klud.js",
tags: ["testing", "unit test", "assert", "spy", "mock"],
description: "A minimal unit testing library.",
url: "https://bitbucket.org/zserge/klud.js/",
source: "https://bitbucket.org/zserge/klud.js/raw/default/klud.js"
},
{
name: "callbacks.js",
tags: ["callbacks", "events", "event manager"],
description: "Callbacks library similar to jQuery's Callbacks. There's also an event manager that allows you to use on(), one(), off() and trigger()",
url: "https://github.com/adrianmiu/callbacks",
source: "https://raw.github.com/adrianmiu/callbacks/master/src/callbacks.js"
},
{
name: "chronoman",
github: "gamtiq/chronoman",
tags: ["setTimeout", "setInterval", "timer", "timeout", "management", "utility"],
description: "Utility class to simplify use of timers created by setTimeout.",
url: "https://github.com/gamtiq/chronoman",
source: "https://raw.github.com/gamtiq/chronoman/master/dist/chronoman.js"
},
{
name: "basespace",
github: "gamtiq/basespace",
tags: ["namespace", "ns", "space", "object"],
description: "Functions to create namespaces inside objects.",
url: "https://github.com/gamtiq/basespace",
source: "https://raw.github.com/gamtiq/basespace/master/dist/basespace.js"
},
{
name: "mixing",
github: "gamtiq/mixing",
tags: ["mix", "merge", "mixin", "object"],
description: "Functions to mix objects.",
url: "https://github.com/gamtiq/mixing",
source: "https://raw.github.com/gamtiq/mixing/master/dist/mixing.js"
},
{
name: "extend",
github: "gamtiq/extend",
tags: ["extend", "inherit", "prototype", "inheritance", "class"],
description: "Make one class (constructor function) inherited from another.",
url: "https://github.com/gamtiq/extend",
source: "https://raw.github.com/gamtiq/extend/master/dist/extend.js"
},
{
name: "numgen",
github: "gamtiq/numgen",
tags: ["number", "sequence", "generator", "progression", "Fibonacci"],
description: "Creates objects that generate number sequences.",
url: "https://github.com/gamtiq/numgen",
source: "https://raw.github.com/gamtiq/numgen/master/dist/numgen.js"
},
{
name: "duratiform",
github: "gamtiq/duratiform",
tags: ["time", "duration", "divide", "separate", "decompose", "format", "millisecond"],
description: "Utility to separate into parts and to format time duration in milliseconds.",
url: "https://github.com/gamtiq/duratiform",
source: "https://raw.github.com/gamtiq/duratiform/master/dist/duratiform.js"
},
{
name: "easter.js",
tags: ["easter-egg", "keys", "sequence"],
description: "Easter eggs made easy.",
url: "https://github.com/rkrupinski/easter.js",
source: "https://raw.github.com/rkrupinski/easter.js/master/easter.js"
},
{
name: "henka",
tags: ["responsive", "respond", "media", "query", "media-query", "queries"],
description: "Light weight, portable, single purpose responsive javascript library.",
url: "https://github.com/toxigenicpoem/henka",
source: "https://raw.github.com/toxigenicpoem/henka/master/src/js/henka-src.js"
},
{
name: "rssi",
tags: ["interpolation", "string", "formatting", "template", "templating"],
description: "Ruby-like simple string interpolation for Node.js and browsers.",
url: "https://github.com/mvasilkov/rssi",
source: "https://raw.github.com/mvasilkov/rssi/master/rssi.js"
},
{
name: "trier.js",
tags: ["repeat", "retry", "predicate", "conditional", "invocation"],
description: "Because everyone loves a trier! Conditional and repeated task invocation for node and browser.",
url: "https://github.com/philbooth/trier.js",
source: "https://raw.github.com/philbooth/trier.js/master/src/trier.js"
},
{
name: "gameloop.js",
tags: ["games"],
description: "Very simple library to create game loop.",
url: "https://github.com/arthesowy/gameloop.js",
source: "https://raw.github.com/arthesowy/gameloop.js/master/gameloop.js"
},
{
name: "FastActive",
tags: ["events", "mobile", "touch"],
description: "FastActive is a javascript snippet that makes websites and web apps feel as responsive as native apps on touch devices.",
url: "https://github.com/jonathanstark/FastActive",
source: "https://raw.github.com/jonathanstark/FastActive/master/FastActive.js"
},
{
name: "JSONP",
tags: ["jsonp", "asynchronous", "async"],
description: "A slim JSONP request library for Javascript",
url: "https://github.com/larryosborn/JSONP",
source: "https://raw.github.com/larryosborn/JSONP/master/dist/jsonp.js"
},
{
name: "ResponsiveComments",
tags: ["responsive", "rwd", "conditional", "loading", "progressive", "enhancement"],
description: "A client-side solution to conditional loading.",
url: "http://responsivecomments.com/",
source: "https://raw.github.com/chambaz/ResponsiveComments/master/responsive-comments.js"
},
{
name: "Sparklines",
tags: ["sparkline", "sparklines", "tiny", "graph", "line", "spark", "chart"],
description: "Create sparkline graphs inline with the text. Good defaults, easy to customize.",
url: "https://github.com/mariusGundersen/sparkline",
source: "https://raw.github.com/mariusGundersen/sparkline/master/source/sparkline.js"
},
{
name: "YoutubeDelayed.js",
tags: ["youtube", "video", "loader"],
description: "A a small script which allows you to load youtube player on page only when the user wants to watch the video.",
url: "https://github.com/MAD-GooZe/YoutubeDelayed.js",
source: "https://raw2.github.com/MAD-GooZe/YoutubeDelayed.js/master/YoutubeDelayed.js"
},
{
name: "Riot",
tags: ["router", "event handling", "template engine", "mvp", "framework", "fast", "tiny"],
description: "The 1kb client-side MVP library. An incredibly fast, powerful yet tiny tool for building large scale web applications.",
url: "https://moot.it/riotjs/",
source: "https://raw2.github.com/moot/riotjs/master/riot.js"
},
{
name: "Contra",
tags: ["async", "asynchronous", "flow", "events", "callbacks", "queue"],
description: "Tiny asynchronous flow control library.",
url: "https://github.com/bevacqua/contra",
source: "https://raw.github.com/bevacqua/contra/master/dist/contra.js"
},
{
name: "preloadr.js",
tags: ["preload", "images"],
description: "Preload images, one after another if needed and callback when every image is ready and/or all of them",
url: "https://github.com/borisschapira/preloadr",
source: "https://raw.github.com/borisschapira/preloadr/master/preloadr.js" |
<<<<<<<
},
{
name: "Spine",
size: "2k",
tags: ["mvc"],
description: "MVC with real protypical inheritance, controllers, model layer and ORM, Ajax and local storage.",
url: "http://maccman.github.com/spine/"
=======
},
{
name: "Kizzy",
size: "0.6k",
tags: ["data", "storage"],
description: "Cross Browser caching util leveraging LocalStorage and XML Store with a Memcached interface",
url: "https://github.com/ded/Kizzy"
},
{
name: "Bowser",
size: "0.25k",
tags: ["feature"],
description: "A browser detector. Because when there is no features to detect, sometimes you have to browser sniff",
url: "https://github.com/ded/bowser"
>>>>>>>
},
{
name: "Spine",
size: "2k",
tags: ["mvc"],
description: "MVC with real protypical inheritance, controllers, model layer and ORM, Ajax and local storage.",
url: "http://maccman.github.com/spine/"
},
{
name: "Kizzy",
size: "0.6k",
tags: ["data", "storage"],
description: "Cross Browser caching util leveraging LocalStorage and XML Store with a Memcached interface",
url: "https://github.com/ded/Kizzy"
},
{
name: "Bowser",
size: "0.25k",
tags: ["feature"],
description: "A browser detector. Because when there is no features to detect, sometimes you have to browser sniff",
url: "https://github.com/ded/bowser" |
<<<<<<<
},
{
name: "Hexy.js",
tags: ["color"],
description: "Converts HEX colors to RGB values and vice versa in various output formats.",
url: "http://github.com/steelsojka/Hexy.js",
source: "https://raw.github.com/steelsojka/Hexy.js/master/src/Hexy.js"
=======
},
{
name: "onDomReady",
tags: ["dom", "event", "ready", "jquery", "load"],
description: "Initialize your code when the DOM is ready. Based on jQuery's ready() method. AMD compatible.",
url: "https://github.com/tubalmartin/ondomready",
source: "https://raw.github.com/tubalmartin/ondomready/master/ondomready.js"
>>>>>>>
},
{
name: "Hexy.js",
tags: ["color"],
description: "Converts HEX colors to RGB values and vice versa in various output formats.",
url: "http://github.com/steelsojka/Hexy.js",
source: "https://raw.github.com/steelsojka/Hexy.js/master/src/Hexy.js"
},
{
name: "onDomReady",
tags: ["dom", "event", "ready", "load"],
description: "Initialize your code when the DOM is ready. Based on jQuery's ready() method. AMD compatible.",
url: "https://github.com/tubalmartin/ondomready",
source: "https://raw.github.com/tubalmartin/ondomready/master/ondomready.js" |
<<<<<<<
name: "minivents",
github: "allouis/minivents",
tags: ["events"],
description: "A mini event library for Javascript applications",
url: "https://github.com/allouis/minivents",
source: "https://raw.github.com/allouis/minivents/master/minivents.js"
},
{
=======
name: "audioJS",
github: "evandrolg/audiojs",
tags: ["audio", "html5"],
description: "AudioJS is a agnostic and cross-browser lib to work easily with the AudioContext API of HTML5.",
url: "https://github.com/evandrolg/audiojs",
source: "https://raw.github.com/EvandroLG/audioJS/master/src/audio-js.js"
},
{
>>>>>>>
name: "minivents",
github: "allouis/minivents",
tags: ["events"],
description: "A mini event library for Javascript applications",
url: "https://github.com/allouis/minivents",
source: "https://raw.github.com/allouis/minivents/master/minivents.js"
},
{
name: "audioJS",
github: "evandrolg/audiojs",
tags: ["audio", "html5"],
description: "AudioJS is a agnostic and cross-browser lib to work easily with the AudioContext API of HTML5.",
url: "https://github.com/evandrolg/audiojs",
source: "https://raw.github.com/EvandroLG/audioJS/master/src/audio-js.js"
},
{ |
<<<<<<<
},
{
name: "LogJS",
tags: ["logging", "CORS", "localStorage", "DOM"],
description: "Lightweight, extendable JavaScript logging library.",
url: "https://github.com/bfattori/LogJS",
source: "https://raw.github.com/bfattori/LogJS/master/log.js"
=======
},
{
name: "StdClassJS",
github: "BlueJeansAndRain/stdclassjs",
tags: ["oop", "class", "extend", "mixin"],
description: "A dead simple JavaScript inheritance implementation.",
url: "https://github.com/BlueJeansAndRain/stdclassjs",
source: "https://raw.github.com/BlueJeansAndRain/stdclassjs/master/stdclass.js"
>>>>>>>
},
{
name: "LogJS",
tags: ["logging", "CORS", "localStorage", "DOM"],
description: "Lightweight, extendable JavaScript logging library.",
url: "https://github.com/bfattori/LogJS",
source: "https://raw.github.com/bfattori/LogJS/master/log.js"
},
{
name: "StdClassJS",
github: "BlueJeansAndRain/stdclassjs",
tags: ["oop", "class", "extend", "mixin"],
description: "A dead simple JavaScript inheritance implementation.",
url: "https://github.com/BlueJeansAndRain/stdclassjs",
source: "https://raw.github.com/BlueJeansAndRain/stdclassjs/master/stdclass.js" |
<<<<<<<
{
name: "Infect.js",
github: "amwmedia/Infect.js",
tags: ["dependency injection", "DI", "dependency", "injection", "dependency-free"],
description: "Infectiously simple dependency injection for any JavaScript project",
url: "https://github.com/amwmedia/infect.js",
source: "https://raw.github.com/amwmedia/infect.js/master/infect.min.js"
},
{
=======
{
name: "Sortable",
github: "RubaXa/Sortable",
tags: ["sortable", "dnd", "reorder", "drag", "touch"],
description: "Sortable is a minimalist JavaScript library for modern browsers and touch devices. No jQuery.",
url: "http://rubaxa.github.com/Sortable/",
source: "https://raw.github.com/RubaXa/Sortable/master/Sortable.js"
},
{
>>>>>>>
{
name: "Infect.js",
github: "amwmedia/Infect.js",
tags: ["dependency injection", "DI", "dependency", "injection", "dependency-free"],
description: "Infectiously simple dependency injection for any JavaScript project",
url: "https://github.com/amwmedia/infect.js",
source: "https://raw.github.com/amwmedia/infect.js/master/infect.min.js"
},
{
name: "Sortable",
github: "RubaXa/Sortable",
tags: ["sortable", "dnd", "reorder", "drag", "touch"],
description: "Sortable is a minimalist JavaScript library for modern browsers and touch devices. No jQuery.",
url: "http://rubaxa.github.com/Sortable/",
source: "https://raw.github.com/RubaXa/Sortable/master/Sortable.js"
},
{ |
<<<<<<<
name: "css-time.js",
github: "philbooth/css-time.js",
tags: ["css", "time", "string", "milliseconds", "convert", "conversion"],
description: "A tiny library that converts milliseconds to and from CSS time strings.",
url: "https://github.com/philbooth/css-time.js",
source: "https://raw.github.com/philbooth/css-time.js/master/src/css-time.js"
},
{
name: "accounting.js",
github: "josscrowcroft/accounting.js",
tags: ["math", "number", "money", "currency parsing", "currency formatting"],
description: "A lightweight JavaScript library for number, money and currency formatting - fully localisable, zero dependencies.",
url: "http://josscrowcroft.github.com/accounting.js/",
source: "https://raw.github.com/josscrowcroft/accounting.js/master/accounting.js"
},
{
=======
name: "sloth.js",
github: "hakubo/Sloth",
tags: ["lazy", "initialize", "viewport", "amd", "library", "scroll"],
description: "Lazy initialize components of a webpage when they become visible",
url: "https://github.com/hakubo/Sloth",
source: "https://raw.github.com/hakubo/Sloth/master/sloth.max.js"
},
{
>>>>>>>
name: "css-time.js",
github: "philbooth/css-time.js",
tags: ["css", "time", "string", "milliseconds", "convert", "conversion"],
description: "A tiny library that converts milliseconds to and from CSS time strings.",
url: "https://github.com/philbooth/css-time.js",
source: "https://raw.github.com/philbooth/css-time.js/master/src/css-time.js"
},
{
name: "accounting.js",
github: "josscrowcroft/accounting.js",
tags: ["math", "number", "money", "currency parsing", "currency formatting"],
description: "A lightweight JavaScript library for number, money and currency formatting - fully localisable, zero dependencies.",
url: "http://josscrowcroft.github.com/accounting.js/",
source: "https://raw.github.com/josscrowcroft/accounting.js/master/accounting.js"
},
{
name: "sloth.js",
github: "hakubo/Sloth",
tags: ["lazy", "initialize", "viewport", "amd", "library", "scroll"],
description: "Lazy initialize components of a webpage when they become visible",
url: "https://github.com/hakubo/Sloth",
source: "https://raw.github.com/hakubo/Sloth/master/sloth.max.js"
},
{ |
<<<<<<<
},
{
name: "keysort",
tags: ["array", "object", "sort", "keys", "sql", "where"],
description: "Sorts an Array of Objects with SQL ORDER BY clause",
url: "https://github.com/avoidwork/keysort",
source: "https://raw.github.com/avoidwork/keysort/master/lib/keysort.js"
},
{
name: "Lie",
tags: ["promise", "deferred","async"],
description: "A very small library for promises",
url: "https://github.com/calvinmetcalf/lie",
source: "https://raw.github.com/calvinmetcalf/lie/master/dist/lie.js"
},
{
name: "klud.js",
tags: ["testing", "unit test", "assert", "spy", "mock"],
description: "A minimal unit testing library.",
url: "https://bitbucket.org/zserge/klud.js/",
source: "https://bitbucket.org/zserge/klud.js/raw/default/klud.js"
=======
},
{
name: "callbacks.js",
tags: ["callbacks", "events", "event manager"],
description: "Callbacks library similar to jQuery's Callbacks. There's also an event manager that allows you to use on(), one(), off() and trigger()",
url: "https://github.com/adrianmiu/callbacks",
source: "https://raw.github.com/adrianmiu/callbacks/master/src/callbacks.js"
>>>>>>>
},
{
name: "keysort",
tags: ["array", "object", "sort", "keys", "sql", "where"],
description: "Sorts an Array of Objects with SQL ORDER BY clause",
url: "https://github.com/avoidwork/keysort",
source: "https://raw.github.com/avoidwork/keysort/master/lib/keysort.js"
},
{
name: "Lie",
tags: ["promise", "deferred","async"],
description: "A very small library for promises",
url: "https://github.com/calvinmetcalf/lie",
source: "https://raw.github.com/calvinmetcalf/lie/master/dist/lie.js"
},
{
name: "klud.js",
tags: ["testing", "unit test", "assert", "spy", "mock"],
description: "A minimal unit testing library.",
url: "https://bitbucket.org/zserge/klud.js/",
source: "https://bitbucket.org/zserge/klud.js/raw/default/klud.js"
},
{
name: "callbacks.js",
tags: ["callbacks", "events", "event manager"],
description: "Callbacks library similar to jQuery's Callbacks. There's also an event manager that allows you to use on(), one(), off() and trigger()",
url: "https://github.com/adrianmiu/callbacks",
source: "https://raw.github.com/adrianmiu/callbacks/master/src/callbacks.js" |
<<<<<<<
},
{
name: "picoCSS",
size: "0.4k",
tags: ["CSS", "CSS3", "mobile"],
description: "Basic CSS DOM manipulation and animation optimized for webkit browsers(Safari, Chrome) for building mobile web apps",
url: "https://github.com/vladocar/picoCSS"
},
{
name: "H5F.js",
size: "1.8k",
tags: ["polyfill"],
description: "Adds support for HTML5 Forms chapters new field input types, attributes and constraint validation API in non-supporting browsers.",
url: "https://github.com/ryanseddon/H5F"
},
{
name: "Store.js",
size: "1.8k",
tags: ["data", "storage"],
description: "localStorage wrapper for all browsers without using cookies or flash",
url: "https://github.com/marcuswestin/store.js"
},
{
name: "Handlebars",
size: "5.0k",
tags: ["templating"],
description: "Build semantic templates effectively with no frustration.",
url: "http://handlebars.strobeapp.com"
},
{
name: "Objs",
size: "0.5k",
tags: ["language"],
description: "A minimalistic library intended to help in using namespaces and class inheritance in JavaScript.",
url: "https://github.com/tekool/objs"
},
{
name: "EventEmitter",
size: "0.6k",
tags: ["events"],
description: "Evented JavaScript for the browser",
url: "https://github.com/Wolfy87/EventEmitter"
},
{
name: "Color",
size: "1.9k",
tags: ["color"],
description: "Color conversion functions for switching between hex decimal, RGB, names and arrays.",
url: "https://github.com/Wolfy87/Color"
},
{
name: "Microajax",
size: "2.1k",
tags: ["ajax"],
description: "Simple AJAX library.",
url: "http://code.google.com/p/microajax/"
},
{
name: "Fermata",
size: "1.9k",
tags: ["ajax"],
description: "Succinct native REST client, for client-side web apps and node.js. Turns URLs into magic JavaScript objects.",
url: "https://github.com/andyet/fermata"
},
{
name: "Base64.js",
size: "0.9k",
tags: ["polyfill"],
description: "`window.btoa` and `window.atob` for browsers which don't provide these functions.",
url: "https://bitbucket.org/davidchambers/base64.js"
},
{
name: "Mibbu",
size: "4.4k",
tags: ["games", "canvas"],
description: "Microframework for fast game prototyping using Canvas & DOM",
url: "https://github.com/michalbe/mibbu"
},
{
name: "Estro",
size: "1.0k",
tags: ["functional","language"],
description: "Estro adds useful methods to strings.",
url: "https://github.com/Nijikokun/Estro"
=======
},
{
name: "nimble",
size: "0.8k",
tags: ["functional", "async"],
description: "Functional flow-control for JavaScript. Combines the most useful features of the underscore and async libraries.",
url: "http://caolan.github.com/nimble/"
>>>>>>>
},
{
name: "picoCSS",
size: "0.4k",
tags: ["CSS", "CSS3", "mobile"],
description: "Basic CSS DOM manipulation and animation optimized for webkit browsers(Safari, Chrome) for building mobile web apps",
url: "https://github.com/vladocar/picoCSS"
},
{
name: "H5F.js",
size: "1.8k",
tags: ["polyfill"],
description: "Adds support for HTML5 Forms chapters new field input types, attributes and constraint validation API in non-supporting browsers.",
url: "https://github.com/ryanseddon/H5F"
},
{
name: "Store.js",
size: "1.8k",
tags: ["data", "storage"],
description: "localStorage wrapper for all browsers without using cookies or flash",
url: "https://github.com/marcuswestin/store.js"
},
{
name: "Handlebars",
size: "5.0k",
tags: ["templating"],
description: "Build semantic templates effectively with no frustration.",
url: "http://handlebars.strobeapp.com"
},
{
name: "Objs",
size: "0.5k",
tags: ["language"],
description: "A minimalistic library intended to help in using namespaces and class inheritance in JavaScript.",
url: "https://github.com/tekool/objs"
},
{
name: "EventEmitter",
size: "0.6k",
tags: ["events"],
description: "Evented JavaScript for the browser",
url: "https://github.com/Wolfy87/EventEmitter"
},
{
name: "Color",
size: "1.9k",
tags: ["color"],
description: "Color conversion functions for switching between hex decimal, RGB, names and arrays.",
url: "https://github.com/Wolfy87/Color"
},
{
name: "Microajax",
size: "2.1k",
tags: ["ajax"],
description: "Simple AJAX library.",
url: "http://code.google.com/p/microajax/"
},
{
name: "Fermata",
size: "1.9k",
tags: ["ajax"],
description: "Succinct native REST client, for client-side web apps and node.js. Turns URLs into magic JavaScript objects.",
url: "https://github.com/andyet/fermata"
},
{
name: "Base64.js",
size: "0.9k",
tags: ["polyfill"],
description: "`window.btoa` and `window.atob` for browsers which don't provide these functions.",
url: "https://bitbucket.org/davidchambers/base64.js"
},
{
name: "Mibbu",
size: "4.4k",
tags: ["games", "canvas"],
description: "Microframework for fast game prototyping using Canvas & DOM",
url: "https://github.com/michalbe/mibbu"
},
{
name: "Estro",
size: "1.0k",
tags: ["functional","language"],
description: "Estro adds useful methods to strings.",
url: "https://github.com/Nijikokun/Estro"
},
{
name: "nimble",
size: "0.8k",
tags: ["functional", "async"],
description: "Functional flow-control for JavaScript. Combines features of the underscore and async libraries.",
url: "http://caolan.github.com/nimble/" |
<<<<<<<
name: "Timesheet.js",
github: "sbstjn/timesheet.js",
tags: ["timesheet", "graph", "charts", "flow", "gantt", "draw"],
description: "Visualize your data with Timesheet.js",
url: "https://github.com/sbstjn/timesheet.js",
source: "https://raw.githubusercontent.com/sbstjn/timesheet.js/master/dist/timesheet.js"
},
{
name: "Muject",
github: "srijs/muject",
tags: ["dependency", "injection", "inversion", "control", "ioc", "di", "require"],
description: "10-SLOC no-bullshit dependency injection micro-library",
url: "https://github.com/srijs/muject",
source: "https://raw.githubusercontent.com/srijs/muject/master/index.js"
},
{
=======
name: "Chop.js",
github: "hufyhang/chop",
tags: ["mvc framework", "mvc", "framework", "templating", "DOM", "routing"],
description: "A Super Light-Weight JavaScript Framework",
url: "https://github.com/hufyhang/chop",
source: "https://raw.githubusercontent.com/hufyhang/chop/master/chop.js"
},
{
>>>>>>>
name: "Timesheet.js",
github: "sbstjn/timesheet.js",
tags: ["timesheet", "graph", "charts", "flow", "gantt", "draw"],
description: "Visualize your data with Timesheet.js",
url: "https://github.com/sbstjn/timesheet.js",
source: "https://raw.githubusercontent.com/sbstjn/timesheet.js/master/dist/timesheet.js"
},
{
name: "Muject",
github: "srijs/muject",
tags: ["dependency", "injection", "inversion", "control", "ioc", "di", "require"],
description: "10-SLOC no-bullshit dependency injection micro-library",
url: "https://github.com/srijs/muject",
source: "https://raw.githubusercontent.com/srijs/muject/master/index.js"
},
{
name: "Chop.js",
github: "hufyhang/chop",
tags: ["mvc framework", "mvc", "framework", "templating", "DOM", "routing"],
description: "A Super Light-Weight JavaScript Framework",
url: "https://github.com/hufyhang/chop",
source: "https://raw.githubusercontent.com/hufyhang/chop/master/chop.js"
},
{ |
<<<<<<<
},
{
name: "SimpleScrollbar",
github: "buzinas/simple-scrollbar",
tags: ["scrollbar", "ui", "interface", "scroll", "custom", "lightweight"],
description: "Very simple vanilla javascript library for creating a custom scrollbar cross-browser and cross-devices",
url: "https://github.com/buzinas/simple-scrollbar",
source: "https://raw.githubusercontent.com/buzinas/simple-scrollbar/master/simple-scrollbar.js"
},
{
name: "tplize",
github: "alxgutnikov/tplize",
tags: ["templates"],
description: "A ~2kb lib for quickly prototyping templated content",
url: "https://github.com/alxgutnikov/tplize",
source: "https://raw.githubusercontent.com/alxgutnikov/tplize/master/index.js"
=======
},
{
{
name: "populate.js",
github: "dannyvankooten/populate.js",
tags: ["json", "form"],
description: "Populate form fields from a JSON object. Extremely small, no dependencies.",
url: "https://github.com/dannyvankooten/populate.js",
source: "https://raw.githubusercontent.com/dannyvankooten/populate.js/master/populate.js"
}
>>>>>>>
},
{
name: "SimpleScrollbar",
github: "buzinas/simple-scrollbar",
tags: ["scrollbar", "ui", "interface", "scroll", "custom", "lightweight"],
description: "Very simple vanilla javascript library for creating a custom scrollbar cross-browser and cross-devices",
url: "https://github.com/buzinas/simple-scrollbar",
source: "https://raw.githubusercontent.com/buzinas/simple-scrollbar/master/simple-scrollbar.js"
},
{
name: "tplize",
github: "alxgutnikov/tplize",
tags: ["templates"],
description: "A ~2kb lib for quickly prototyping templated content",
url: "https://github.com/alxgutnikov/tplize",
source: "https://raw.githubusercontent.com/alxgutnikov/tplize/master/index.js"
},
{
name: "populate.js",
github: "dannyvankooten/populate.js",
tags: ["json", "form"],
description: "Populate form fields from a JSON object. Extremely small, no dependencies.",
url: "https://github.com/dannyvankooten/populate.js",
source: "https://raw.githubusercontent.com/dannyvankooten/populate.js/master/populate.js" |
<<<<<<<
source: "https://raw.githubusercontent.com/lagodiuk/decision-tree-js/master/decision-tree.js"
},
{
name: "Grapnel.js",
tags: ["grapnel", "route", "routing", "router", "hash", "anchor", "tiny", "require", "named", "parameters"],
description: "The smallest (1100 bytes gzipped!) JavaScript Router with Named Parameters",
url: "https://github.com/EngineeringMode/Grapnel.js",
source: "https://raw.githubusercontent.com/EngineeringMode/Grapnel.js/master/dist/grapnel.min.js"
},
{
name: "Nerve",
tags: ["async", "asynchronous", "channel", "route", "observer", "mediator", "events", "callbacks", "queue"],
description: "An asynchronous javascript micro framework for event broadcasts along routes and channels.",
url: "https://github.com/jstandish/nerve",
source: "https://raw.githubusercontent.com/jstandish/nerve/master/nerve.js"
=======
source: "https://raw.github.com/lagodiuk/decision-tree-js/master/decision-tree.js"
},
{
name: "tiny-stack",
tags: ["stack", "data", "amd"],
description: "Tiny stack for browser or server",
url: "http://avoidwork.github.io/tiny-stack",
source: "https://raw.githubusercontent.com/avoidwork/tiny-stack/master/lib/tiny-stack.js"
>>>>>>>
source: "https://raw.githubusercontent.com/lagodiuk/decision-tree-js/master/decision-tree.js"
},
{
name: "Grapnel.js",
tags: ["grapnel", "route", "routing", "router", "hash", "anchor", "tiny", "require", "named", "parameters"],
description: "The smallest (1100 bytes gzipped!) JavaScript Router with Named Parameters",
url: "https://github.com/EngineeringMode/Grapnel.js",
source: "https://raw.githubusercontent.com/EngineeringMode/Grapnel.js/master/dist/grapnel.min.js"
},
{
name: "Nerve",
tags: ["async", "asynchronous", "channel", "route", "observer", "mediator", "events", "callbacks", "queue"],
description: "An asynchronous javascript micro framework for event broadcasts along routes and channels.",
url: "https://github.com/jstandish/nerve",
source: "https://raw.githubusercontent.com/jstandish/nerve/master/nerve.js"
},
{
name: "tiny-stack",
tags: ["stack", "data", "amd"],
description: "Tiny stack for browser or server",
url: "http://avoidwork.github.io/tiny-stack",
source: "https://raw.githubusercontent.com/avoidwork/tiny-stack/master/lib/tiny-stack.js" |
<<<<<<<
},
{
name: "Rlite",
tags: ["rlite", "route", "routing", "router", "hash", "querystring", "named", "parameters"],
description: "Tiny, simple, light-weight routing",
url: "https://github.com/chrisdavies/rlite",
source: "https://raw.githubusercontent.com/chrisdavies/rlite/master/rlite.js"
},
{
name: "nanoajax",
tags: ["ajax","http"],
description: "Very basic cross-browser AJAX",
url: "https://github.com/yanatan16/nanoajax",
source: "https://raw.githubusercontent.com/yanatan16/nanoajax/master/index.js"
},
{
name: "stupid-lib",
tags: ["light-weight", "helpers", "jquery-like", "simple"],
description: "browser-javascript, jquery-like lib",
url: "https://github.com/nighca/lib",
source: "https://raw.githubusercontent.com/nighca/lib/master/dist/lib.js"
},
{
name: "i-canvas",
tags: ["canvas", "dom-like", "html5"],
description: "Lib for generating & operating objects on canvas.",
url: "https://github.com/nighca/i-canvas",
source: "https://raw.githubusercontent.com/nighca/i-canvas/master/dist/i-canvas/1.2.0/index.js"
},
{
name: "universal-diff",
tags: ["diff", "compare", "string", "array", "queue"],
description: "diff & merge algorithm realized with Javascript.",
url: "https://github.com/nighca/universal-diff",
source: "https://raw.githubusercontent.com/nighca/universal-diff/master/dist/diff.js"
},
{
name: "lightrouter",
tags: ["lightrouter", "route", "routing", "router", "hash", "querystring", "named", "parameters"],
description: "Ultra lightweight javascript routing for traditional and single page apps.",
url: "https://github.com/garygreen/lightrouter",
source: "https://github.com/garygreen/lightrouter/blob/master/src/lightrouter.js"
},
{
name: "ListOf",
tags: ["list", "collection", "array", "library", "c#"],
description: "A JavaScript implementation of the C# List<T> object.",
url: "https://github.com/joelalejandro/stuff",
source: "https://github.com/joelalejandro/stuff/raw/master/ListOf.js"
},
{
name: "EventoJS",
tags: ["dom events", "event", "evento"],
description: "An easy way to manipulate events on DOM.",
url: "https://github.com/gustavohenrique/eventojs",
source: "https://raw.githubusercontent.com/gustavohenrique/eventojs/master/src/evento.js"
=======
},
{
name: "Carpet.js",
github: "mateuszgachowski/Carpet.js",
tags: ["module", "simple", "autoload", "context", "settings", "module pattern", "advice"],
description: "Small, easy-to-learn and modular JavaScript framework for big",
url: "https://github.com/mateuszgachowski/Carpet.js",
source: "https://raw.githubusercontent.com/mateuszgachowski/Carpet.js/master/src/carpet.js"
>>>>>>>
},
{
name: "Rlite",
tags: ["rlite", "route", "routing", "router", "hash", "querystring", "named", "parameters"],
description: "Tiny, simple, light-weight routing",
url: "https://github.com/chrisdavies/rlite",
source: "https://raw.githubusercontent.com/chrisdavies/rlite/master/rlite.js"
},
{
name: "nanoajax",
tags: ["ajax","http"],
description: "Very basic cross-browser AJAX",
url: "https://github.com/yanatan16/nanoajax",
source: "https://raw.githubusercontent.com/yanatan16/nanoajax/master/index.js"
},
{
name: "stupid-lib",
tags: ["light-weight", "helpers", "jquery-like", "simple"],
description: "browser-javascript, jquery-like lib",
url: "https://github.com/nighca/lib",
source: "https://raw.githubusercontent.com/nighca/lib/master/dist/lib.js"
},
{
name: "i-canvas",
tags: ["canvas", "dom-like", "html5"],
description: "Lib for generating & operating objects on canvas.",
url: "https://github.com/nighca/i-canvas",
source: "https://raw.githubusercontent.com/nighca/i-canvas/master/dist/i-canvas/1.2.0/index.js"
},
{
name: "universal-diff",
tags: ["diff", "compare", "string", "array", "queue"],
description: "diff & merge algorithm realized with Javascript.",
url: "https://github.com/nighca/universal-diff",
source: "https://raw.githubusercontent.com/nighca/universal-diff/master/dist/diff.js"
},
{
name: "lightrouter",
tags: ["lightrouter", "route", "routing", "router", "hash", "querystring", "named", "parameters"],
description: "Ultra lightweight javascript routing for traditional and single page apps.",
url: "https://github.com/garygreen/lightrouter",
source: "https://github.com/garygreen/lightrouter/blob/master/src/lightrouter.js"
},
{
name: "ListOf",
tags: ["list", "collection", "array", "library", "c#"],
description: "A JavaScript implementation of the C# List<T> object.",
url: "https://github.com/joelalejandro/stuff",
source: "https://github.com/joelalejandro/stuff/raw/master/ListOf.js"
},
{
name: "EventoJS",
tags: ["dom events", "event", "evento"],
description: "An easy way to manipulate events on DOM.",
url: "https://github.com/gustavohenrique/eventojs",
source: "https://raw.githubusercontent.com/gustavohenrique/eventojs/master/src/evento.js"
},
{
name: "Carpet.js",
github: "mateuszgachowski/Carpet.js",
tags: ["module", "simple", "autoload", "context", "settings", "module pattern", "advice"],
description: "Small, easy-to-learn and modular JavaScript framework for big",
url: "https://github.com/mateuszgachowski/Carpet.js",
source: "https://raw.githubusercontent.com/mateuszgachowski/Carpet.js/master/src/carpet.js" |
<<<<<<<
},
{
name: "color.js",
github: "brehaut/color-js",
tags: ["color", "color manipulation"],
description: "API for immutable color objects in RGB, HSV and HSL with optional alpha. Comprehensive CSS format parsing and output.",
url: "https://github.com/brehaut/color-js/",
source: "https://raw.github.com/brehaut/color-js/master/color.js"
},
{
name: "ScriptInclude",
tags: ["loader"],
description: "Simple includes in the browser.",
url: "https://github.com/EvanHahn/ScriptInclude",
source: "https://raw.github.com/EvanHahn/ScriptInclude/master/include.js"
},
{
name: "cssanimevent",
github: "magnetikonline/cssanimevent",
tags: ["animation", "css3", "events", "polyfill", "transitions"],
description: "CSS3 animation and transition DOM event handler with a simple fallback pattern for unsupported browsers.",
url: "https://github.com/magnetikonline/cssanimevent",
source: "https://raw.github.com/magnetikonline/cssanimevent/master/cssanimevent.js"
},
{
name: "ClassJS",
tags: ["class", "inheritance", "namespace", "node"],
description: "JavaScript classical inheritance for the browser and Node.js. Super methods and namespaces",
url: "https://github.com/jimmynewtron/ClassJS",
source: "https://raw.github.com/jimmynewtron/ClassJS/master/src/core/Class.js"
},
{
name: "Hamster.js",
github: "monospaced/hamster.js",
tags: ["mousewheel", "mouse", "wheel", "events"],
description: "A standalone JavaScript library for cross-browser mouse wheel support.",
url: "https://github.com/monospaced/hamster.js",
source: "http://monospaced.github.io/hamster.js/hamster.js"
=======
},
{
name: "spin.js",
tags: ["spinning", "indicator", "loading", "spinner"],
description: "A spinning activity indicator. An animated CSS3 loading spinner.",
url: "http://fgnass.github.io/spin.js/",
source: "https://raw.github.com/fgnass/spin.js/gh-pages/dist/spin.js"
>>>>>>>
},
{
name: "color.js",
github: "brehaut/color-js",
tags: ["color", "color manipulation"],
description: "API for immutable color objects in RGB, HSV and HSL with optional alpha. Comprehensive CSS format parsing and output.",
url: "https://github.com/brehaut/color-js/",
source: "https://raw.github.com/brehaut/color-js/master/color.js"
},
{
name: "ScriptInclude",
tags: ["loader"],
description: "Simple includes in the browser.",
url: "https://github.com/EvanHahn/ScriptInclude",
source: "https://raw.github.com/EvanHahn/ScriptInclude/master/include.js"
},
{
name: "cssanimevent",
github: "magnetikonline/cssanimevent",
tags: ["animation", "css3", "events", "polyfill", "transitions"],
description: "CSS3 animation and transition DOM event handler with a simple fallback pattern for unsupported browsers.",
url: "https://github.com/magnetikonline/cssanimevent",
source: "https://raw.github.com/magnetikonline/cssanimevent/master/cssanimevent.js"
},
{
name: "ClassJS",
tags: ["class", "inheritance", "namespace", "node"],
description: "JavaScript classical inheritance for the browser and Node.js. Super methods and namespaces",
url: "https://github.com/jimmynewtron/ClassJS",
source: "https://raw.github.com/jimmynewtron/ClassJS/master/src/core/Class.js"
},
{
name: "Hamster.js",
github: "monospaced/hamster.js",
tags: ["mousewheel", "mouse", "wheel", "events"],
description: "A standalone JavaScript library for cross-browser mouse wheel support.",
url: "https://github.com/monospaced/hamster.js",
source: "http://monospaced.github.io/hamster.js/hamster.js"
},
{
name: "spin.js",
tags: ["spinning", "indicator", "loading", "spinner"],
description: "A spinning activity indicator. An animated CSS3 loading spinner.",
url: "http://fgnass.github.io/spin.js/",
source: "https://raw.github.com/fgnass/spin.js/gh-pages/dist/spin.js" |
<<<<<<<
},
{
name: "SpeculOOs",
size: "0.3k",
tags: ["language", "class"],
description: "Simple JavaScript Class notation, fully CoffeeScript compliant",
url: "https://github.com/k33g/speculoos",
source: "https://raw.github.com/k33g/speculoos/master/speculoos.js"
},
{
name: "aug",
size: "0.2k",
tags: ["extend", "augment"],
description: "A object extend utility",
url: "https://github.com/jgallen23/aug",
source: "https://raw.github.com/jgallen23/aug/master/dist/aug.js"
},
{
name: "path.js",
size: "1k",
tags: ["route"],
description: "Simple, lightweight routing for web browsers",
url: "http://mtrpcic.github.com/pathjs/",
source: "https://raw.github.com/mtrpcic/pathjs/master/path.js"
},
{
name: "scaleApp.js",
size: "2.1k",
tags: ["spa", "base", "events"],
description: "scaleApp is a tiny JavaScript framework for scalable one-page-applications",
url: "http://scaleapp.org/",
source: "http://scaleapp.org/build/scaleApp.js"
},
{
name: "Humane JS",
size: "1.3k",
tags: ["notification", "alert"],
description: "A simple, modern, browser notification system",
url: "http://wavded.github.com/humane-js/",
source: "https://raw.github.com/wavded/humane-js/master/humane.js"
},
{
name: "JSFace",
size: "1k",
tags: ["oop", "language", "commonjs", "node", "class"],
description: "An object-oriented programming library",
url: "https://github.com/tannhu/jsface",
source: "https://raw.github.com/tannhu/jsface/master/jsface.js"
},
{
name: "Radio.js",
size: "0.4k",
tags: ["events", "pubsub"],
description: "Chainable publish/subscribe framework",
url: "http://radio.uxder.com",
source: "https://raw.github.com/uxder/Radio/master/radio.js"
},
{
name: "keyvent.js",
size: "0.6k",
tags: ["dom", "events", "amd"],
description: "Keyboard events simulator.",
url: "https://github.com/gtramontina/keyvent.js",
source: "https://raw.github.com/gtramontina/keyvent.js/master/keyvent.js"
},
{
name: "draggable.js",
size: "0.4k",
tags: ["dom", "css", "css3", "amd"],
description: "Make your dom elements draggable easily.",
url: "http://gtramontina.github.com/draggable.js/",
source: "https://raw.github.com/gtramontina/draggable.js/master/draggable.js"
},
{
name: "T-Lite",
size: "0.5k",
tags: ["templating"],
description: "A lite but powerfull javascript template engine",
url: "https://github.com/CapMousse/T-Lite",
source: "https://raw.github.com/CapMousse/T-Lite/master/tlite.js"
=======
},
{
name: "String::format",
size: "0.5k",
tags: ["string", "language", "sugar"],
description: "Adds a `format` method to `String.prototype`. Inspired by Python's `str.format()`.",
url: "https://bitbucket.org/davidchambers/string-format",
source: "https://bitbucket.org/davidchambers/string-format/raw/default/string-format.js"
>>>>>>>
},
{
name: "SpeculOOs",
size: "0.3k",
tags: ["language", "class"],
description: "Simple JavaScript Class notation, fully CoffeeScript compliant",
url: "https://github.com/k33g/speculoos",
source: "https://raw.github.com/k33g/speculoos/master/speculoos.js"
},
{
name: "aug",
size: "0.2k",
tags: ["extend", "augment"],
description: "A object extend utility",
url: "https://github.com/jgallen23/aug",
source: "https://raw.github.com/jgallen23/aug/master/dist/aug.js"
},
{
name: "path.js",
size: "1k",
tags: ["route"],
description: "Simple, lightweight routing for web browsers",
url: "http://mtrpcic.github.com/pathjs/",
source: "https://raw.github.com/mtrpcic/pathjs/master/path.js"
},
{
name: "scaleApp.js",
size: "2.1k",
tags: ["spa", "base", "events"],
description: "scaleApp is a tiny JavaScript framework for scalable one-page-applications",
url: "http://scaleapp.org/",
source: "http://scaleapp.org/build/scaleApp.js"
},
{
name: "Humane JS",
size: "1.3k",
tags: ["notification", "alert"],
description: "A simple, modern, browser notification system",
url: "http://wavded.github.com/humane-js/",
source: "https://raw.github.com/wavded/humane-js/master/humane.js"
},
{
name: "JSFace",
size: "1k",
tags: ["oop", "language", "commonjs", "node", "class"],
description: "An object-oriented programming library",
url: "https://github.com/tannhu/jsface",
source: "https://raw.github.com/tannhu/jsface/master/jsface.js"
},
{
name: "Radio.js",
size: "0.4k",
tags: ["events", "pubsub"],
description: "Chainable publish/subscribe framework",
url: "http://radio.uxder.com",
source: "https://raw.github.com/uxder/Radio/master/radio.js"
},
{
name: "keyvent.js",
size: "0.6k",
tags: ["dom", "events", "amd"],
description: "Keyboard events simulator.",
url: "https://github.com/gtramontina/keyvent.js",
source: "https://raw.github.com/gtramontina/keyvent.js/master/keyvent.js"
},
{
name: "draggable.js",
size: "0.4k",
tags: ["dom", "css", "css3", "amd"],
description: "Make your dom elements draggable easily.",
url: "http://gtramontina.github.com/draggable.js/",
source: "https://raw.github.com/gtramontina/draggable.js/master/draggable.js"
},
{
name: "T-Lite",
size: "0.5k",
tags: ["templating"],
description: "A lite but powerfull javascript template engine",
url: "https://github.com/CapMousse/T-Lite",
source: "https://raw.github.com/CapMousse/T-Lite/master/tlite.js"
},
{
name: "String::format",
size: "0.5k",
tags: ["string", "language", "sugar"],
description: "Adds a `format` method to `String.prototype`. Inspired by Python's `str.format()`.",
url: "https://bitbucket.org/davidchambers/string-format",
source: "https://bitbucket.org/davidchambers/string-format/raw/default/string-format.js" |
<<<<<<<
source: "https://raw.githubusercontent.com/radiosilence/xr/master/src/xr.js"
},
{
name: "SimpleScrollbar",
github: "buzinas/simple-scrollbar",
tags: ["scrollbar", "ui", "interface", "scroll", "custom", "lightweight"],
description: "Very simple vanilla javascript library for creating a custom scrollbar cross-browser and cross-devices",
url: "https://github.com/buzinas/simple-scrollbar",
source: "https://raw.githubusercontent.com/buzinas/simple-scrollbar/master/simple-scrollbar.js"
},
{
name: "tplize",
github: "alxgutnikov/tplize",
tags: ["templates"],
description: "A ~2kb lib for quickly prototyping templated content",
url: "https://github.com/alxgutnikov/tplize",
source: "https://raw.githubusercontent.com/alxgutnikov/tplize/master/index.js"
},
{
name: "populate.js",
github: "dannyvankooten/populate.js",
tags: ["json", "form"],
description: "Populate form fields from a JSON object. Extremely small, no dependencies.",
url: "https://github.com/dannyvankooten/populate.js",
source: "https://raw.githubusercontent.com/dannyvankooten/populate.js/master/populate.js"
},
{
name: "offside.js",
github: "toomuchdesign/offside",
tags: ["menu", "navigation", "responsive", "off-canvas","offcanvas", "off", "canvas"],
description: "A minimal ~3kb JavaScript kit without library dependencies to push things off-canvas using using just class manipulation.",
url: "https://github.com/toomuchdesign/offside",
source: "https://raw.githubusercontent.com/toomuchdesign/offside/master/dist/offside.js"
},
{
name: "html-chain",
github: "maael/html-chain",
tags: ["html", "lightweight","dom", "dom-builder", "templating", "chain"],
description: "A small javascript library to build DOM elements by chaining javascript functions",
url: "https://github.com/maael/html-chain",
source: "https://raw.githubusercontent.com/maael/html-chain/master/html.js"
},
{
name: "swiss-army-knife.js",
github: "imaustink/swiss-army-knife",
tags: ["helper", "lightweight", "polyfill", "ES6", "forEach", "date", "dates", "user", "freindly", "browser"],
description: "Swiss Army Knife is a JavaScript library intended to make client side development a little less painfull.",
url: "https://github.com/imaustink/swiss-army-knife",
source: "https://raw.githubusercontent.com/imaustink/swiss-army-knife/master/swiss-army-knife.js"
},
{
name: "wallop.js",
github: "peduarte/wallop",
tags: ["helper", "lightweight", "slider", "browser", "carousel", "native", "slideshow", "gallery", "toggle"],
description: "A minimal JS library for showing & hiding things.",
url: "https://github.com/peduarte/wallop",
source: "https://raw.githubusercontent.com/peduarte/wallop/master/js/Wallop.js"
},
{
name: "isMobileOS.js",
github: "RazorfishGermany/es6-module-isMobileOs",
tags: ["helper", "lightweight", "mobile", "detection", "user agent string", "ES6", "UMD"],
description: "A simple ECMAScript6 module which checks for mobile operating systems.",
url: "https://github.com/RazorfishGermany/es6-module-isMobileOs",
source: "https://raw.githubusercontent.com/RazorfishGermany/es6-module-isMobileOs/master/dist/main.js"
},
{
name: "nanoflux.js",
github: "ohager/nanoflux",
tags: ["flux", "lightweight", "full flux", "tiny", "micro"],
description: "A very lightweight and dependency-free Flux implementation",
url: "https://github.com/ohager/nanoflux",
source: "https://raw.githubusercontent.com/ohager/nanoflux/master/dist/nanoflux.js"
},
{
name: "preact",
github: "developit/preact",
tags: ["dom", "templating"],
description: "Tiny & fast Component-based Virtual DOM framework.",
url: "https://github.com/developit/preact",
source: "https://raw.githubusercontent.com/developit/preact/master/src/preact.js"
},
{
name: "smoke-signal",
github: "StephanHoyer/smoke-signal",
tags: ["pubsub", "event", "observer"],
description: "Simple small functional event observer for the browser and node.",
url: "https://github.com/StephanHoyer/smoke-signal",
source: "https://raw.githubusercontent.com/StephanHoyer/smoke-signal/master/index.js"
},
{
name: "nanoflux.js",
github: "ohager/nanoflux",
tags: ["flux", "lightweight", "full flux", "tiny", "micro"],
description: "A very lightweight and dependency-free Flux implementation",
url: "https://github.com/ohager/nanoflux",
source: "https://raw.githubusercontent.com/ohager/nanoflux/master/dist/nanoflux.js"
},
{
name: "min.css",
github: "w3core/min.css",
tags: ["minify", "css", "javascript", "nodejs", "fastest", "tiniest"],
description: "min.css is the tiniest, fastest and efficient JavaScript library for minifying CSS files. It works in node and the browser.",
url: "https://github.com/w3core/min.css",
source: "https://raw.githubusercontent.com/w3core/min.css/master/min.css.js"
},
{
name: "viiny-dragger",
github: "giraysam/viiny-dragger",
tags: ["viiny", "viiny-dragger", "drag and drop"],
description: "vinny-dragger is a drag and drop plugin for javascript.",
url: "http://giraysam.github.io/viiny-dragger/",
source: "https://raw.githubusercontent.com/giraysam/viiny-dragger/master/src/index.js"
=======
source: "https://raw.githubusercontent.com/radiosilence/xr/master/xr.js"
},
{
name: "razax.js",
github: "razaibi/razaxjs",
tags: ["ajax", "xhr", "xmlhttprequest", "simple", "nojquery", "minimalcode"],
description: "Simple way to make ajax requests with or without arguments in single line of code. Easy for novice users.",
url: "https://github.com/razaibi/razaxjs",
source: "https://raw.githubusercontent.com/razaibi/razaxjs/master/razax.js"
>>>>>>>
source: "https://raw.githubusercontent.com/radiosilence/xr/master/src/xr.js"
},
{
name: "SimpleScrollbar",
github: "buzinas/simple-scrollbar",
tags: ["scrollbar", "ui", "interface", "scroll", "custom", "lightweight"],
description: "Very simple vanilla javascript library for creating a custom scrollbar cross-browser and cross-devices",
url: "https://github.com/buzinas/simple-scrollbar",
source: "https://raw.githubusercontent.com/buzinas/simple-scrollbar/master/simple-scrollbar.js"
},
{
name: "tplize",
github: "alxgutnikov/tplize",
tags: ["templates"],
description: "A ~2kb lib for quickly prototyping templated content",
url: "https://github.com/alxgutnikov/tplize",
source: "https://raw.githubusercontent.com/alxgutnikov/tplize/master/index.js"
},
{
name: "populate.js",
github: "dannyvankooten/populate.js",
tags: ["json", "form"],
description: "Populate form fields from a JSON object. Extremely small, no dependencies.",
url: "https://github.com/dannyvankooten/populate.js",
source: "https://raw.githubusercontent.com/dannyvankooten/populate.js/master/populate.js"
},
{
name: "offside.js",
github: "toomuchdesign/offside",
tags: ["menu", "navigation", "responsive", "off-canvas","offcanvas", "off", "canvas"],
description: "A minimal ~3kb JavaScript kit without library dependencies to push things off-canvas using using just class manipulation.",
url: "https://github.com/toomuchdesign/offside",
source: "https://raw.githubusercontent.com/toomuchdesign/offside/master/dist/offside.js"
},
{
name: "html-chain",
github: "maael/html-chain",
tags: ["html", "lightweight","dom", "dom-builder", "templating", "chain"],
description: "A small javascript library to build DOM elements by chaining javascript functions",
url: "https://github.com/maael/html-chain",
source: "https://raw.githubusercontent.com/maael/html-chain/master/html.js"
},
{
name: "swiss-army-knife.js",
github: "imaustink/swiss-army-knife",
tags: ["helper", "lightweight", "polyfill", "ES6", "forEach", "date", "dates", "user", "freindly", "browser"],
description: "Swiss Army Knife is a JavaScript library intended to make client side development a little less painfull.",
url: "https://github.com/imaustink/swiss-army-knife",
source: "https://raw.githubusercontent.com/imaustink/swiss-army-knife/master/swiss-army-knife.js"
},
{
name: "wallop.js",
github: "peduarte/wallop",
tags: ["helper", "lightweight", "slider", "browser", "carousel", "native", "slideshow", "gallery", "toggle"],
description: "A minimal JS library for showing & hiding things.",
url: "https://github.com/peduarte/wallop",
source: "https://raw.githubusercontent.com/peduarte/wallop/master/js/Wallop.js"
},
{
name: "isMobileOS.js",
github: "RazorfishGermany/es6-module-isMobileOs",
tags: ["helper", "lightweight", "mobile", "detection", "user agent string", "ES6", "UMD"],
description: "A simple ECMAScript6 module which checks for mobile operating systems.",
url: "https://github.com/RazorfishGermany/es6-module-isMobileOs",
source: "https://raw.githubusercontent.com/RazorfishGermany/es6-module-isMobileOs/master/dist/main.js"
},
{
name: "nanoflux.js",
github: "ohager/nanoflux",
tags: ["flux", "lightweight", "full flux", "tiny", "micro"],
description: "A very lightweight and dependency-free Flux implementation",
url: "https://github.com/ohager/nanoflux",
source: "https://raw.githubusercontent.com/ohager/nanoflux/master/dist/nanoflux.js"
},
{
name: "preact",
github: "developit/preact",
tags: ["dom", "templating"],
description: "Tiny & fast Component-based Virtual DOM framework.",
url: "https://github.com/developit/preact",
source: "https://raw.githubusercontent.com/developit/preact/master/src/preact.js"
},
{
name: "smoke-signal",
github: "StephanHoyer/smoke-signal",
tags: ["pubsub", "event", "observer"],
description: "Simple small functional event observer for the browser and node.",
url: "https://github.com/StephanHoyer/smoke-signal",
source: "https://raw.githubusercontent.com/StephanHoyer/smoke-signal/master/index.js"
},
{
name: "nanoflux.js",
github: "ohager/nanoflux",
tags: ["flux", "lightweight", "full flux", "tiny", "micro"],
description: "A very lightweight and dependency-free Flux implementation",
url: "https://github.com/ohager/nanoflux",
source: "https://raw.githubusercontent.com/ohager/nanoflux/master/dist/nanoflux.js"
},
{
name: "min.css",
github: "w3core/min.css",
tags: ["minify", "css", "javascript", "nodejs", "fastest", "tiniest"],
description: "min.css is the tiniest, fastest and efficient JavaScript library for minifying CSS files. It works in node and the browser.",
url: "https://github.com/w3core/min.css",
source: "https://raw.githubusercontent.com/w3core/min.css/master/min.css.js"
},
{
name: "viiny-dragger",
github: "giraysam/viiny-dragger",
tags: ["viiny", "viiny-dragger", "drag and drop"],
description: "vinny-dragger is a drag and drop plugin for javascript.",
url: "http://giraysam.github.io/viiny-dragger/",
source: "https://raw.githubusercontent.com/giraysam/viiny-dragger/master/src/index.js"
},
{
name: "razax.js",
github: "razaibi/razaxjs",
tags: ["ajax", "xhr", "xmlhttprequest", "simple", "nojquery", "minimalcode"],
description: "Simple way to make ajax requests with or without arguments in single line of code. Easy for novice users.",
url: "https://github.com/razaibi/razaxjs",
source: "https://raw.githubusercontent.com/razaibi/razaxjs/master/razax.js" |
<<<<<<<
let a = this.s.map(this.s.mouseX, 0, this.s.width, this.lb * this.step, this.ub * this.step);
let b = this.s.map(this.s.mouseY, 0, this.s.height, this.ub * this.step, this.lb * this.step);
let x = a * matrix[0] + b * matrix[3];
let y = a * matrix[1] + b * matrix[4];
let z = a * matrix[2] + b * matrix[5];
this.arrow4.reset({
to: [x, y, z]
});
=======
let b0_coeff = map(mouseX, 0, width, this.lb * this.step, this.ub * this.step);
let b_coeff = map(mouseY, 0, height, this.ub * this.step, this.lb * this.step);
let x = b0_coeff * matrix[0] + b_coeff * matrix[3];
let y = b0_coeff * matrix[1] + b_coeff * matrix[4];
let z = b0_coeff * matrix[2] + b_coeff * matrix[5];
this.arrow4.reset({ to: [x, y, z] });
>>>>>>>
let b0_coeff = this.s.map(this.s.mouseX, 0, this.s.width, this.lb * this.step, this.ub * this.step);
let b_coeff = this.s.map(this.s.mouseY, 0, this.s.height, this.ub * this.step, this.lb * this.step);
let x = b0_coeff * matrix[0] + b_coeff * matrix[3];
let y = b0_coeff * matrix[1] + b_coeff * matrix[4];
let z = b0_coeff * matrix[2] + b_coeff * matrix[5];
this.arrow4.reset({ to: [x, y, z] });
<<<<<<<
this.text1.reset({str: "" + (a / this.step).toFixed(2)});
=======
this.text1.reset({ str: "" + (b0_coeff / this.step).toFixed(2) });
>>>>>>>
this.text1.reset({ str: "" + (b0_coeff / this.step).toFixed(2) });
<<<<<<<
this.text2.reset({str: "" + (b / this.step).toFixed(2)});
=======
this.text2.reset({ str: "" + (b_coeff / this.step).toFixed(2) });
>>>>>>>
this.text2.reset({ str: "" + (b_coeff / this.step).toFixed(2) });
<<<<<<<
hg = new HelperGrid(s);
arrows = new Plane_LinComb(s, {
mat: matrix,
y: target,
font: font,
x_1: obj[1],
x_2: obj[2],
y_o: obj[3],
// r_o: obj[4],
size: 300
});
kats[0] = new KatexTxt(s, {
text: "\\beta_0\\newline\\downarrow",
x: 820, y: 87,
=======
function draw() {
background(0);
axes.show(g3);
>>>>>>>
hg = new HelperGrid(s);
arrows = new Plane_LinComb(s, {
mat: matrix,
y: target,
font: font,
x_1: obj[1],
x_2: obj[2],
y_o: obj[3],
// r_o: obj[4],
size: 300
});
kats[0] = new KatexTxt(s, {
text: "\\beta_0\\newline\\downarrow",
x: 820, y: 87,
<<<<<<<
s.draw = function () {
s.background(0);
axes.show(g3);
// g3.pointLight(147, 147, 147, 0, 1, 0);
// g3.ambientLight(27, 27, 27);
arrows.show(g3);
//hg.show();
s.image(g3, 0, 0, cvh, cvh);
for (let k of kats) k.show();
=======
image(g3, 0, 0, cvh, cvh);
>>>>>>>
s.draw = function () {
s.background(0);
axes.show(g3);
// g3.pointLight(147, 147, 147, 0, 1, 0);
// g3.ambientLight(27, 27, 27);
arrows.show(g3);
//hg.show();
s.image(g3, 0, 0, cvh, cvh);
for (let k of kats) k.show(); |
<<<<<<<
class Text {
constructor(ctx, args) {
this.s = ctx;
=======
class Text extends TextBase {
constructor(args) {
super(args);
>>>>>>>
class Text extends TextBase {
constructor(ctx, args) {
super(ctx, args);
<<<<<<<
this.s.textAlign(this.s.CENTER, this.s.CENTER);
=======
textAlign(CENTER, CENTER);
} else if (this.mode === 2) {
textAlign(RIGHT, TOP);
>>>>>>>
this.s.textAlign(this.s.CENTER, this.s.CENTER);
textAlign(CENTER, CENTER);
} else if (this.mode === 2) {
this.s.textAlign(RIGHT, TOP);
<<<<<<<
this.s.noStroke();
=======
noStroke();
if (this.moved) {
this.moving();
}
>>>>>>>
this.s.noStroke();
if (this.moved) {
this.moving();
}
<<<<<<<
// sample instantiation:
// kat1 = new KatexTxt({
// str: "\\frac {\\sum_{i=1}^n (x_i-\\bar{x})(y_i-\\bar{y})} {\\sum_{i=1}^n(x_i-\\bar{x})^2}",
// x: 720,
// y: 200,
// fadeIn: true,
// fontsize: 80
// });
class KatexTxt {
constructor(ctx, args) {
this.s = ctx;
=======
class KatexBase extends TextBase {
constructor(args) {
super(args);
>>>>>>>
// sample instantiation:
// kat1 = new KatexTxt({
// str: "\\frac {\\sum_{i=1}^n (x_i-\\bar{x})(y_i-\\bar{y})} {\\sum_{i=1}^n(x_i-\\bar{x})^2}",
// x: 720,
// y: 200,
// fadeIn: true,
// fontsize: 80
// });
class KatexTxt extends TextBase {
constructor(ctx, args) {
super(ctx, args);
<<<<<<<
if (this.fadeIn && this.s.frameCount > this.start) {
=======
if (this.moved) {
this.moving();
}
// moved this from ctor to here to enable move animations
this.k.position(this.x, this.y);
if (this.fadeIn && frameCount > this.start) {
>>>>>>>
if (this.moved) {
this.moving();
}
this.k.position(this.x + this.canvasPos.x, this.y + this.canvasPos.y); // Based on the canvas position in the DOM
if (this.fadeIn && frameCount > this.start) {
<<<<<<<
=======
}
}
// sample instantiation:
// kat1 = new Katex1({
// str: "\\frac {\\sum_{i=1}^n (x_i-\\bar{x})(y_i-\\bar{y})} {\\sum_{i=1}^n(x_i-\\bar{x})^2}",
// x: 720,
// y: 200,
// fadeIn: true,
// fontsize: 80
// });
class Katex0 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt0');
}
show() {
this.showInit();
katex.render(this.text, kt0);
}
}
class Katex1 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt1');
}
show() {
this.showInit();
katex.render(this.text, kt1);
}
}
class Katex2 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt2');
}
show() {
this.showInit();
katex.render(this.text, kt2);
}
}
class Katex3 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt3');
}
show() {
this.showInit();
katex.render(this.text, kt3);
}
}
class Katex4 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt4');
}
show() {
this.showInit();
katex.render(this.text, kt4);
}
}
class Katex5 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt5');
}
show() {
this.showInit();
katex.render(this.text, kt5);
}
}
class Katex6 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt6');
}
show() {
this.showInit();
katex.render(this.text, kt6);
}
}
class Katex7 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt7');
}
show() {
this.showInit();
katex.render(this.text, kt7);
}
}
class Katex8 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt8');
}
show() {
this.showInit();
katex.render(this.text, kt8);
}
}
class Katex9 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt9');
}
show() {
this.showInit();
katex.render(this.text, kt9);
}
}
class Katex10 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt10');
}
show() {
this.showInit();
katex.render(this.text, kt10);
}
}
class Katex11 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt11');
}
show() {
this.showInit();
katex.render(this.text, kt11);
}
}
class Katex12 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt12');
}
show() {
this.showInit();
katex.render(this.text, kt12);
}
}
class Katex13 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt13');
}
show() {
this.showInit();
katex.render(this.text, kt13);
}
}
class Katex14 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt14');
}
show() {
this.showInit();
katex.render(this.text, kt14);
}
}
class Katex15 extends KatexBase {
constructor(args) {
super(args);
this.k.id('kt15');
}
show() {
this.showInit();
katex.render(this.text, kt15);
}
}
class KatexAxis1 extends KatexBase {
constructor(args) {
super(args);
this.k.id('ktaxis1');
}
show() {
this.showInit();
katex.render(this.text, ktaxis1);
}
}
class KatexAxis2 extends KatexBase {
constructor(args) {
super(args);
this.k.id('ktaxis2');
}
show() {
>>>>>>> |
<<<<<<<
clearMatrix(){
const ctx = this;
const { values, channels, steps} = ctx.state;
console.log(values);
for (var i = 0; i < channels.length*steps; i++) {
values [i] = [];
}
ctx.setState({values});
}
=======
>>>>>>>
clearMatrix(){
const ctx = this;
const { values, channels, steps} = ctx.state;
console.log(values);
for (var i = 0; i < channels.length*steps; i++) {
values [i] = [];
}
ctx.setState({values});
} |
<<<<<<<
duration: 8,
steps: 24,
=======
duration: 32,
steps: 32,
>>>>>>>
duration: 8,
steps: 24,
duration: 32,
steps: 32, |
<<<<<<<
=======
// Convert time expression to SS.mmm
// Expression may be absolute to timeline (hh:mm:ss.ms)
// or relative ( fraction followedd by metric ) ex: 3.4s, 5.7m
// Returns -1 if invalid
var toSeconds = function ( t_in, offset ) {
if ( !t_in ) {
return -1;
}
var t = t_in.split( ":" ),
l = t.length - 1,
metric,
multiplier,
i;
// Try clock time
if ( l >= 2 ) {
return parseInt( t[0], 10 )*3600 + parseInt( t[l-1], 10 )*60 + parseFloat( t[l], 10 );
}
// Was not clock time, assume relative time
// Take metric from end of string (may not be single character)
// First find metric
for( i = t_in.length - 1; i >= 0; i-- ) {
if ( t_in[i] <= "9" && t_in[i] >= "0" ) {
break;
}
}
// Point i at metric and normalize offsete time
i++;
metric = t_in.substr( i );
offset = offset || 0;
// Determine multiplier for metric relative to seconds
if ( metric === "h" ) {
multiplier = 3600;
} else if ( metric === "m" ) {
multiplier = 60;
} else if ( metric === "s" ) {
multiplier = 1;
} else if ( metric === "ms" ) {
multiplier = 0.001;
} else {
return -1;
}
// Valid multiplier
return parseFloat( t_in.substr( 0, i ) ) * multiplier + offset;
};
// creates an object of all atrributes keyd by name
var createTrack = function( name, attributes ) {
var track = {};
track[name] = attributes;
return track;
};
// Parse a node for text content
var parseNode = function( node, timeOffset ) {
var sub = {};
// Trim left and right whitespace from text and change non-explicit line breaks to spaces
sub.text = node.textContent.replace(/^[\s]+|[\s]+$/gm, "").replace(/(?:\r\n|\r|\n)/gm, "<br />");
sub.id = node.getAttribute( "xml:id" ) || node.getAttribute( "id" );
sub.start = toSeconds ( node.getAttribute( "begin" ), timeOffset );
sub.end = toSeconds( node.getAttribute( "end" ), timeOffset );
sub.target = region;
if ( sub.end < 0 ) {
// No end given, infer duration if possible
// Otherwise, give end as MAX_VALUE
sub.end = toSeconds( node.getAttribute( "duration" ), 0 );
if ( sub.end >= 0 ) {
sub.end += sub.start;
} else {
sub.end = Number.MAX_VALUE;
}
}
return sub;
};
// Parse the children of the given node
var parseChildren = function( node, timeOffset ) {
var currNode = node.firstChild,
sub,
newOffset;
while ( currNode ) {
if ( currNode.nodeType === 1 ) {
if ( currNode.nodeName === "p" ) {
// p is a teextual node, process contents as subtitle
sub = parseNode( currNode, timeOffset );
returnData.data.push( createTrack( "subtitle", sub ) );
numTracks++;
} else if ( currNode.nodeName === "div" ) {
// div is container for subtitles, recurse
newOffset = toSeconds( currNode.getAttribute("begin") );
if (newOffset < 0 ) {
newOffset = timeOffset;
}
parseChildren( currNode, newOffset );
}
}
currNode = currNode.nextSibling;
}
};
>>>>>>> |
<<<<<<<
searchEngine.getDescription(id, callback);
});
=======
socket.on('getContentLength', (url, callback) => {
redis.hget('mvw:contentLengthCache', url, (err, result) => {
if (result) {
callback(result);
} else {
request.head(url, (error, response, body) => {
let contentLength = -1;
if (!!response && !!response.headers['content-length']) {
contentLength = response.headers['content-length'];
}
callback(contentLength);
redis.hset('mvw:contentLengthCache', url, contentLength);
});
}
});
});
>>>>>>>
searchEngine.getDescription(id, callback);
});
socket.on('getContentLength', (url, callback) => {
redis.hget('mvw:contentLengthCache', url, (err, result) => {
if (result) {
callback(result);
} else {
request.head(url, (error, response, body) => {
let contentLength = -1;
if (!!response && !!response.headers['content-length']) {
contentLength = response.headers['content-length'];
}
callback(contentLength);
redis.hset('mvw:contentLengthCache', url, contentLength);
});
}
});
}); |
<<<<<<<
super(props);
this.state={
matName: "",
modelName : "Matrices",
tidalServerLink: 'localhost:3001',
steps: 12,
channels: ['d1','d2','d3', 'd4', 'd5','d6'],
timer: [],
values: {},
scCommand: '',
click : {current:null,
isActive:false},
activeMatrix: '',
songmodeActive: false,
sceneIndex: '',
channelEnd: [],
play : false,
sceneSentinel: false
}
const ctx=this;
var tempEnd = [];
const { channels , steps , timer} = ctx.state;
for (var i = 0; i < channels.length; i++) {
if (timer[i] === undefined) timer[i]={ id: i, duration: 48, isActive: false, current: 0};
ctx.createTimer(i, 48, steps);
tempEnd[i] = false
}
this.state.channelEnd = tempEnd;
}
=======
super(props);
this.state={
matName: "",
modelName : "Matrices",
tidalServerLink: 'localhost:3001',
steps: 12,
channels: ['d1','d2','d3', 'd4', 'd5','m1'],
timer: [],
values: {},
scCommand: '',
click : {current:null,
isActive:false},
activeMatrix: '',
songmodeActive: false,
sceneIndex: '',
channelEnd :[],
play : false,
sceneSentinel: false
}
}
>>>>>>>
super(props);
this.state={
matName: "",
modelName : "Matrices",
tidalServerLink: 'localhost:3001',
steps: 12,
channels: ['d1','d2','d3', 'd4', 'd5','m1'],
timer: [],
values: {},
scCommand: '',
click : {current:null,
isActive:false},
activeMatrix: '',
songmodeActive: false,
sceneIndex: '',
channelEnd :[],
play : false,
sceneSentinel: false
}
}
<<<<<<<
componentDidUpdate(prevProps, prevState) {
console.log('componentDidUpdate');
=======
// shouldComponentUpdate(nextProps, nextState) {
// const {timer} = nextProps;
// const {channels} = nextState;
// for (var i = 0; i < channels.length; i++) {
// if (nextProps.timer.timer[i].isActive) {
// return true;
// }
// }
// return false;
// }
componentWillMount(props,state){
console.log(this.props.location.pathname);
const ctx=this;
var tempEnd = [];
const { channelEnd, channels , steps , timer}=ctx.state;
for (var i = 0; i < channels.length; i++) {
if (timer[i] === undefined) timer[i]={ id: i, duration: 48, isActive: false, current: 0};
ctx.createTimer(i, 48, steps);
//store.dispatch(timerThread(i, ctx.props.timer.timer[i].duration, steps));
tempEnd[i] = false
}
ctx.setState({channelEnd : tempEnd});
}
createTimer(i,duration, steps){
store.dispatch(createTimer(i,duration,steps));
}
componentDidUpdate(props, state) {
>>>>>>>
// shouldComponentUpdate(nextProps, nextState) {
// const {timer} = nextProps;
// const {channels} = nextState;
// for (var i = 0; i < channels.length; i++) {
// if (nextProps.timer.timer[i].isActive) {
// return true;
// }
// }
// return false;
// }
componentWillMount(props,state){
console.log(this.props.location.pathname);
const ctx=this;
var tempEnd = [];
const { channelEnd, channels , steps , timer}=ctx.state;
for (var i = 0; i < channels.length; i++) {
if (timer[i] === undefined) timer[i]={ id: i, duration: 48, isActive: false, current: 0};
ctx.createTimer(i, 48, steps);
//store.dispatch(timerThread(i, ctx.props.timer.timer[i].duration, steps));
tempEnd[i] = false
}
ctx.setState({channelEnd : tempEnd});
}
createTimer(i,duration, steps){
store.dispatch(createTimer(i,duration,steps));
}
componentDidUpdate(props, state) {
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
soloChannel(){
//add solo channels
//const _key = event.target.id;
}
renderPlayer() {
const ctx=this;
const { channels, steps , timer}=ctx.state;
const playerClass="Player Player--" + (channels.length + 1.0) + "cols";
var count = 1;
return (<div className="Player-holder">
<div className={playerClass}>
<div className="playbox playbox-cycle">cycle</div>
{_.map(channels, c => {
return <div className="playbox playbox-cycle" key={c}>{c}<input className = "durInput" id = {c} value={ctx.props.timer.timer[_.indexOf(channels, c)].duration}
onChange = {ctx.updateDur.bind(ctx)}onKeyPress={ctx._handleKeyPress.bind(ctx)}/> <img src={require('../assets/[email protected]')} id = {c} onClick={ctx.soloChannel.bind(ctx)} height={20} width={20}/> </div>
})}
</div>
{_.map(Array.apply(null, Array(steps)), ctx.renderStep.bind(ctx))}
</div>)
}
>>>>>>>
soloChannel(){
//add solo channels
//const _key = event.target.id;
}
renderPlayer() {
const ctx=this;
const { channels, steps , timer}=ctx.state;
const playerClass="Player Player--" + (channels.length + 1.0) + "cols";
var count = 1;
return (<div className="Player-holder">
<div className={playerClass}>
<div className="playbox playbox-cycle">cycle</div>
{_.map(channels, c => {
return <div className="playbox playbox-cycle" key={c}>{c}<input className = "durInput" id = {c} value={ctx.props.timer.timer[_.indexOf(channels, c)].duration}
onChange = {ctx.updateDur.bind(ctx)}onKeyPress={ctx._handleKeyPress.bind(ctx)}/> <img src={require('../assets/[email protected]')} id = {c} onClick={ctx.soloChannel.bind(ctx)} height={20} width={20}/> </div>
})}
</div>
{_.map(Array.apply(null, Array(steps)), ctx.renderStep.bind(ctx))}
</div>)
}
<<<<<<<
pauseTimer() {
=======
pauseTimer() {
>>>>>>>
pauseTimer() {
<<<<<<<
=======
>>>>>>>
<<<<<<<
// {!timer.isActive && <img src={require('../assets/play_icon.png')} onClick={ctx.startTimer.bind(ctx)} height={32} width={32}/>}
// {timer.isActive && <div> <img src={require('../assets/pause_icon.png')} onClick={ctx.pauseTimer} height={32} width={32}/>
// <img src={require('../assets/stop_icon.png')} onClick={ctx.stopTimer} height={32} width={32}/> </div>}
//<pre style={{marginTop: '0px'}}>{JSON.stringify(timer, null, 2)}</pre>
=======
//<pre style={{marginTop: '0px'}}>{JSON.stringify(timer, null, 2)}</pre>
// Cellular and Bjorklund HTMLS
// <div id="Celluar">
// <p>Cellular Automata Updates</p>
// <input type="textarea" value={getValue()} onChange={updateDensity} placeholder="" rows="20" cols="30"/>
// {!timer.isCelluarActive && <button onClick={celluarFill}>Run</button>}
// {timer.isCelluarActive && <button onClick={celluarFillStop}>Stop</button>}
// <button onClick={addValues}> Add </button>
// </div>
// <div id="Celluar">
// <p>Bjorklund Algorithm Updates</p>
// {!timer.isBjorkActive && <button onClick={bjorkFill}>Run</button>}
// {timer.isBjorkActive && <button onClick={bjorkFillStop}>Stop</button>}
// <button onClick={addBjorkValues}> Add </button>
// </div>
>>>>>>>
// {!timer.isActive && <img src={require('../assets/play_icon.png')} onClick={ctx.startTimer.bind(ctx)} height={32} width={32}/>}
// {timer.isActive && <div> <img src={require('../assets/pause_icon.png')} onClick={ctx.pauseTimer} height={32} width={32}/>
// <img src={require('../assets/stop_icon.png')} onClick={ctx.stopTimer} height={32} width={32}/> </div>}
//<pre style={{marginTop: '0px'}}>{JSON.stringify(timer, null, 2)}</pre> |
<<<<<<<
const x = _.compact(_.map(vals,(v,k) => {
// gets parameters list
const getParameters = (v) => {
var param = [];
_.map(_.split(v, /[`]+/g), (p1, p2) => {
p1 = _.trim(p1);
=======
const getFinalPattern = () => {
console.log('INDEXJS ', channel, stepValue);
// channel
var k = channel.name;
>>>>>>>
const getFinalPattern = () => {
console.log('INDEXJS ', channel, stepValue);
// channel
var k = channel.name;
<<<<<<<
// CPS channel handling
if(_.indexOf(channels,k) === _.indexOf(channels,'cps')){
var newCommand = cellName;
return [k + " " + newCommand, "sendOSC d_OSC $ Message \"tree\" [string \"command\", string \""+cellItem+"\"]"] ;
}
// other channels
else if(cmd !== undefined && cmd !== null && cmd !== "" && v !== ""){
var cellItem = _.slice(getParameters(v), 1);
var newCommand = cmd.pattern;
// Construct the parameter list from command
var parameters = _.concat( _.split(cmd.params, ','),'t');
// For each parameter in parameter list
_.forEach(parameters, function(value, i) {
// Temporal parameter
if(value === 't'){
newCommand = _.replace(newCommand, new RegExp("`t`", "g"), timer.current);
}
// Random parameter
else if(_.indexOf(cellItem[i], '|') != -1 )
{
cellItem[i] = cellItem[i].substring(1, _.indexOf(cellItem[i], ']'));
var bounds = _.split(cellItem[i], ',');
if(bounds[0] !== undefined && bounds[0] !== "" &&
bounds[1] !== undefined && bounds[1] !== ""){
bounds[0] = parseFloat(bounds[0]);
bounds[1] = parseFloat(bounds[1]);
cellItem[i] = _.random(_.min(bounds), _.max(bounds));
newCommand = _.replace(newCommand, new RegExp("`"+value+"`", "g"), cellItem[i]);
}
=======
// Math Parser
// eslint-disable-next-line
_.forEach(_.words(newCommand, /\&(.*?)\&/g), function(val, i){
newCommand = _.replace(newCommand, val, _.trim(math.eval(_.trim(val,"&")),"[]"));
})
// solo or not (obsolete)
var transitionHolder,
soloHolder;
// var channel_id,
// channel_type,
// channel_transition,
// channel_name,
// _k;
// _.each(channels, function(chantwo,i){
// if(k[0] === (Object.values(chantwo)[2])){//check if the right channel
// // channel_type = chantwo.type;
// channel_transition = chantwo.transition;
// // channel_name = chantwo.name;
// channel_id = chantwo.cid;
// soloHolder = k[0];
// transitionHolder = "" ;
// _k = k;
//
// }
// })
if (channel.transition === "" || channel.transition === undefined ){
transitionHolder = " $ ";
soloHolder = k ;
>>>>>>>
// Math Parser
// eslint-disable-next-line
_.forEach(_.words(newCommand, /\&(.*?)\&/g), function(val, i){
newCommand = _.replace(newCommand, val, _.trim(math.eval(_.trim(val,"&")),"[]"));
})
// solo or not (obsolete)
var transitionHolder,
soloHolder;
if (channel.transition === "" || channel.transition === undefined ){
transitionHolder = " $ ";
soloHolder = k ;
<<<<<<<
export const sendGlobals = (server,storedPatterns,storedGlobals, vals,channels) => {
return dispatch => {
const getParameters = (v) => {
var param = [];
_.map(_.split(v, /[`]+/g), (p1, p2) => {
p1 = _.trim(p1);
if(p1 !== "") param.push(p1);
});
return param;
}
const globalindex = getParameters(vals)[0];
if(globalindex !== undefined){
var pat = [],ch;
// command of the pattern
var currentglobal = Object.values(storedGlobals[globalindex]);
var activeChannels = _.slice(getParameters(vals), 1);
// Construct the active channel list from channel list
var tch = [];
activeChannels = _.split(activeChannels, ' ');
var b = new RegExp("^[A-Za-z0-9]+", "g");
_.forEach(activeChannels, function(chan, i) {
tch.push (chan);
var stp=storedPatterns[chan-1];
if(stp !== undefined){
ch = stp.match(b)[0];
ch = ch + ' $ ';
stp = stp.substring(stp.indexOf('$')+1);
console.log(stp);
var pp = ch + currentglobal[1] + stp + currentglobal[0];
console.log(pp);
pat.push(pp);
}
});
// for (var j = 0; j < storedPatterns.length; j++) {
// pat.push(storedPatterns[j]);
// }
}
axios.post('http://' + server.replace('http:', '').replace('/', '').replace('https:', '') + '/pattern', { 'pattern': pat })
.then((response) => {
}).catch(function (error) {
console.error(error);
});
}
}
export const consoleSubmitHistory = (server, expression, storedPatterns,channels) => {
return dispatch => {
var b = new RegExp("^[A-Za-z0-9]+", "g");
var ch = expression.match(b)[0];
console.log(ch);
if (ch === 'm1' || ch === 'm2' || ch === 'm3' || ch === 'm4' || ch === 'v1' || ch === 'u1'){
storedPatterns[_.indexOf(channels,ch)] = '';
storedPatterns[_.indexOf(channels,ch)] = expression;
}
else if ( expression === 'jou'){
for (var i = 0; i < storedPatterns.length; i++) {
storedPatterns[i] = channels[i] + ' $ silence' ;
}
}
else{
storedPatterns[_.indexOf(channels,ch)] = '';
storedPatterns[_.indexOf(channels,ch)] = expression;
}
axios.post('http://' + server.replace('http:', '').replace('/', '').replace('https:', '') + '/pattern', { 'pattern': [expression] })
.then((response) => {
}).catch(function (error) {
console.error(error);
});
}
}
=======
export const sendGlobals = (server,storedPatterns,storedGlobals, vals,channels) => {
return dispatch => {
const getParameters = (v) => {
var param = [];
_.map(_.split(v, /[`]+/g), (p1, p2) => {
p1 = _.trim(p1);
if(p1 !== "") param.push(p1);
});
return param;
}
const globalindex = getParameters(vals)[0];
if(globalindex !== undefined){
var pat = [],ch;
// command of the pattern
var currentglobal = Object.values(storedGlobals[globalindex]);
var activeChannels = _.slice(getParameters(vals), 1);
// Construct the active channel list from channel list
var tch = [];
activeChannels = _.split(activeChannels, ' ');
var b = new RegExp("^[A-Za-z0-9]+", "g");
_.forEach(activeChannels, function(chan, i) {
tch.push (chan);
var stp=storedPatterns[chan-1];
if(stp !== undefined){
ch = stp.match(b)[0];
ch += ' $ ';
stp = stp.substring(stp.indexOf('$')+1);
pat.push(ch + currentglobal[1] + stp + currentglobal[0]);
}
});
}
axios.post('http://' + server.replace('http:', '').replace('/', '').replace('https:', '') + '/pattern', { 'pattern': pat })
.then((response) => {
}).catch(function (error) {
console.error(error);
});
}
}
>>>>>>>
export const sendGlobals = (server,storedPatterns,storedGlobals, vals,channels) => {
return dispatch => {
const getParameters = (v) => {
var param = [];
_.map(_.split(v, /[`]+/g), (p1, p2) => {
p1 = _.trim(p1);
if(p1 !== "") param.push(p1);
});
return param;
}
const globalindex = getParameters(vals)[0];
if(globalindex !== undefined){
var pat = [],ch;
// command of the pattern
var currentglobal = Object.values(storedGlobals[globalindex]);
var activeChannels = _.slice(getParameters(vals), 1);
// Construct the active channel list from channel list
var tch = [];
activeChannels = _.split(activeChannels, ' ');
var b = new RegExp("^[A-Za-z0-9]+", "g");
_.forEach(activeChannels, function(chan, i) {
tch.push (chan);
var stp=storedPatterns[chan-1];
if(stp !== undefined){
ch = stp.match(b)[0];
ch += ' $ ';
stp = stp.substring(stp.indexOf('$')+1);
pat.push(ch + currentglobal[1] + stp + currentglobal[0]);
}
});
}
axios.post('http://' + server.replace('http:', '').replace('/', '').replace('https:', '') + '/pattern', { 'pattern': pat })
.then((response) => {
}).catch(function (error) {
console.error(error);
});
}
}
<<<<<<<
var timerWorker= [];
export const createTimer = (_index,_duration, _steps) => {
timerWorker[_index] = new Worker("./src/actions/tworker.js");
timerWorker[_index].onmessage = function(e) {
if (e.data.type == "tick") {
store.dispatch(updtmr(e.data.id));
timer[_index] = e.data.msg;
}
=======
export function forceUpdateLayout(windows, current_layout_length) {
// react-grid-layout only rerenders when number of layouts have changed.
// Add or remove a dummy layout to change the number of layouts, and force
// it to rerender itself
if(windows.length === current_layout_length){
if(_.find(windows, function(o) { return o.i === 'dummy'; })){
windows = _.reject(windows, ['i', 'dummy']);
>>>>>>>
export function forceUpdateLayout(windows, current_layout_length) {
// react-grid-layout only rerenders when number of layouts have changed.
// Add or remove a dummy layout to change the number of layouts, and force
// it to rerender itself
if(windows.length === current_layout_length){
if(_.find(windows, function(o) { return o.i === 'dummy'; })){
windows = _.reject(windows, ['i', 'dummy']); |
<<<<<<<
.default('p', 'windows,android,ios,chrome')
=======
.alias('m', 'manifest')
.default('p', 'windows,android,ios')
>>>>>>>
.default('p', 'windows,android,ios,chrome')
.alias('m', 'manifest') |
<<<<<<<
'use strict';
var utils = require('../common/utils'),
url = require('url'),
fs = require('fs'),
path = require('path'),
request = require('request'),
archiver = require('archiver'),
cloudappx = require('gulp-appx'),
log = require('loglevel');
var serviceEndpoint = 'http://cloudappx.azurewebsites.net';
function replaceManifestValues(w3cManifest, content) {
var replacedContent = content;
var guid = utils.newGuid();
var applicationId = utils.sanitizeName(w3cManifest.short_name);
// Update general properties
replacedContent = replacedContent.replace(/{IdentityName}/g, guid)
.replace(/{PhoneProductId}/g, guid)
.replace(/{DisplayName}/g, w3cManifest.short_name)
.replace(/{ApplicationId}/g, applicationId)
.replace(/{StartPage}/g, w3cManifest.start_url)
.replace(/{DisplayName}/g, w3cManifest.short_name)
.replace(/{Description}/g, w3cManifest.name || w3cManifest.short_name)
.replace(/{RotationPreference}/g, w3cManifest.orientation || 'portrait');
// Update access rules
var indentationChars = '\r\n\t\t\t\t';
// Set the base access rule using the start_url's base url
var baseUrlPattern = url.resolve(w3cManifest.start_url, '/');
if (w3cManifest.scope && w3cManifest.scope.length) {
// If the scope is defined, the base access rule is defined by the scope
var parsedScopeUrl = url.parse(w3cManifest.scope);
if (parsedScopeUrl.host && parsedScopeUrl.protocol) {
baseUrlPattern = w3cManifest.scope;
} else {
baseUrlPattern = url.resolve(baseUrlPattern, w3cManifest.scope);
}
}
// If the base access rule ends with '/*', remove the '*'.
if (baseUrlPattern.indexOf('/*', baseUrlPattern.length - 2) !== -1) {
baseUrlPattern = baseUrlPattern.substring(0, baseUrlPattern.length - 1);
}
var applicationContentUriRules = '<uap:Rule Type="include" Match="' + baseUrlPattern + '" />';
// Add additional access rules
if (w3cManifest.mjs_access_whitelist && w3cManifest.mjs_access_whitelist instanceof Array) {
for (var j = 0; j < w3cManifest.mjs_access_whitelist.length; j++) {
var accessUrl = w3cManifest.mjs_access_whitelist[j].url;
// Ignore the '*' rule
if (accessUrl !== '*') {
// If the access url ends with '/*', remove the '*'.
if (accessUrl.indexOf('/*', accessUrl.length - 2) !== -1) {
accessUrl = accessUrl.substring(0, accessUrl.length - 1);
}
if (accessUrl.indexOf(baseUrlPattern) !== 0) { // To avoid duplicates, add the rule only if it does not have the base URL as a prefix
applicationContentUriRules += indentationChars + '<uap:Rule Type="include" Match="' + accessUrl + '" />';
}
}
}
}
replacedContent = replacedContent.replace(/{ApplicationContentUriRules}/g, applicationContentUriRules);
return replacedContent;
}
// Start CloudAppX
var makeAppx = function (appName, appFolder, callback) {
var options = { "dir": path.join(appFolder, 'manifest'), "name": appName, "out": appFolder };
cloudappx.makeappx(options).then(
function (output) {
callback && callback();
},
function (err) {
log.debug('Unable to create the package locally. Invoking the CloudAppX service instead...');
invokeCloudAppX(appName, appFolder, function (err) {
callback && callback(err);
});
}
);
}
function invokeCloudAppX(appName, appFolder, callback) {
var zipFile = path.join(appFolder, appName + '.zip');
var output = fs.createWriteStream(zipFile);
var archive = archiver('zip');
output.on('close', function () {
var uploadUrl = url.resolve(serviceEndpoint, '/v1/upload');
var req = request.post(uploadUrl, function (err, resp, body) {
if (err) {
return callback && callback(err);
}
fs.unlink(zipFile, function (err) {
if (err) {
return callback && callback(err);
}
if (resp.statusCode != 200) {
return callback && callback(new Error('Failed to create the package. The CloudAppX service returned an error: \'' + body + '\''));
}
var packageUrl = url.resolve(serviceEndpoint, body);
var req = request.get(packageUrl)
.on('response', function (res) {
var err;
if (res.statusCode == 200) {
var filename = path.join(appFolder, appName + '.appx');
res.pipe(fs.createWriteStream(filename));
}
else {
err = new Error('Failed to download the generated package. The CloudAppX service returned an error: \'' + res.statusMessage + '\'');
}
callback && callback(err);
})
.on('error', function (err) {
callback && callback(err);
});
});
});
var form = req.form();
form.append('xml', fs.createReadStream(zipFile));
});
archive.on('error', function (err) {
callback && callback(err);
});
archive.pipe(output);
var appContents = path.join(appFolder, 'manifest');
archive.directory(appContents, appName);
archive.finalize();
}
// End CloudAppX
module.exports = {
replaceManifestValues: replaceManifestValues,
makeAppx: makeAppx
};
=======
'use strict';
var utils = require('../common/utils');
var url = require('url');
var version = require('../common/version');
function replaceManifestValues(w3cManifest, content) {
var replacedContent = content;
var guid = utils.newGuid();
var applicationId = utils.sanitizeName(w3cManifest.short_name);
// Update general properties
replacedContent = replacedContent.replace(/{IdentityName}/g, guid)
.replace(/{PhoneProductId}/g, guid)
.replace(/{DisplayName}/g, w3cManifest.short_name)
.replace(/{ApplicationId}/g, applicationId)
.replace(/{StartPage}/g, w3cManifest.start_url)
.replace(/{DisplayName}/g, w3cManifest.short_name)
.replace(/{Description}/g, w3cManifest.name || w3cManifest.short_name)
.replace(/{RotationPreference}/g, w3cManifest.orientation || 'portrait')
.replace(/{ManifoldJSVersion}/g, version.getCurrentPackageVersion());
// Update access rules
var indentationChars = '\r\n\t\t\t\t';
// Set the base access rule using the start_url's base url
var baseUrlPattern = url.resolve(w3cManifest.start_url, '/');
var baseApiAccess = 'none';
if (w3cManifest.scope && w3cManifest.scope.length) {
// If the scope is defined, the base access rule is defined by the scope
var parsedScopeUrl = url.parse(w3cManifest.scope);
if (parsedScopeUrl.host && parsedScopeUrl.protocol) {
baseUrlPattern = w3cManifest.scope;
} else {
baseUrlPattern = url.resolve(baseUrlPattern, w3cManifest.scope);
}
}
// If the base access rule ends with '/*', remove the '*'.
if (baseUrlPattern.indexOf('/*', baseUrlPattern.length - 2) !== -1) {
baseUrlPattern = baseUrlPattern.substring(0, baseUrlPattern.length - 1);
}
var applicationContentUriRules = '';
// Add additional access rules
if (w3cManifest.mjs_access_whitelist && w3cManifest.mjs_access_whitelist instanceof Array) {
for (var j = 0; j < w3cManifest.mjs_access_whitelist.length; j++) {
var accessUrl = w3cManifest.mjs_access_whitelist[j].url;
// Ignore the '*' rule
if (accessUrl !== '*') {
// If the access url ends with '/*', remove the '*'.
if (accessUrl.indexOf('/*', accessUrl.length - 2) !== -1) {
accessUrl = accessUrl.substring(0, accessUrl.length - 1);
}
var apiAccess = w3cManifest.mjs_access_whitelist[j].apiAccess || 'none';
if (accessUrl === baseUrlPattern) {
baseApiAccess = apiAccess;
} else {
applicationContentUriRules += indentationChars + '<uap:Rule Type="include" WindowsRuntimeAccess="' + apiAccess + '" Match="' + accessUrl + '" />';
}
}
}
}
// Added base rule
applicationContentUriRules = '<uap:Rule Type="include" WindowsRuntimeAccess="' + baseApiAccess + '" Match="' + baseUrlPattern + '" />' + applicationContentUriRules;
replacedContent = replacedContent.replace(/{ApplicationContentUriRules}/g, applicationContentUriRules);
return replacedContent;
}
module.exports = {
replaceManifestValues: replaceManifestValues
};
>>>>>>>
'use strict';
var utils = require('../common/utils'),
url = require('url'),
fs = require('fs'),
path = require('path'),
request = require('request'),
archiver = require('archiver'),
cloudappx = require('gulp-appx'),
log = require('loglevel');
var version = require('../common/version');
var serviceEndpoint = 'http://cloudappx.azurewebsites.net';
function replaceManifestValues(w3cManifest, content) {
var replacedContent = content;
var guid = utils.newGuid();
var applicationId = utils.sanitizeName(w3cManifest.short_name);
// Update general properties
replacedContent = replacedContent.replace(/{IdentityName}/g, guid)
.replace(/{PhoneProductId}/g, guid)
.replace(/{DisplayName}/g, w3cManifest.short_name)
.replace(/{ApplicationId}/g, applicationId)
.replace(/{StartPage}/g, w3cManifest.start_url)
.replace(/{DisplayName}/g, w3cManifest.short_name)
.replace(/{Description}/g, w3cManifest.name || w3cManifest.short_name)
.replace(/{RotationPreference}/g, w3cManifest.orientation || 'portrait')
.replace(/{ManifoldJSVersion}/g, version.getCurrentPackageVersion());
// Update access rules
var indentationChars = '\r\n\t\t\t\t';
// Set the base access rule using the start_url's base url
var baseUrlPattern = url.resolve(w3cManifest.start_url, '/');
var baseApiAccess = 'none';
if (w3cManifest.scope && w3cManifest.scope.length) {
// If the scope is defined, the base access rule is defined by the scope
var parsedScopeUrl = url.parse(w3cManifest.scope);
if (parsedScopeUrl.host && parsedScopeUrl.protocol) {
baseUrlPattern = w3cManifest.scope;
} else {
baseUrlPattern = url.resolve(baseUrlPattern, w3cManifest.scope);
}
}
// If the base access rule ends with '/*', remove the '*'.
if (baseUrlPattern.indexOf('/*', baseUrlPattern.length - 2) !== -1) {
baseUrlPattern = baseUrlPattern.substring(0, baseUrlPattern.length - 1);
}
var applicationContentUriRules = '';
// Add additional access rules
if (w3cManifest.mjs_access_whitelist && w3cManifest.mjs_access_whitelist instanceof Array) {
for (var j = 0; j < w3cManifest.mjs_access_whitelist.length; j++) {
var accessUrl = w3cManifest.mjs_access_whitelist[j].url;
// Ignore the '*' rule
if (accessUrl !== '*') {
// If the access url ends with '/*', remove the '*'.
if (accessUrl.indexOf('/*', accessUrl.length - 2) !== -1) {
accessUrl = accessUrl.substring(0, accessUrl.length - 1);
}
var apiAccess = w3cManifest.mjs_access_whitelist[j].apiAccess || 'none';
if (accessUrl === baseUrlPattern) {
baseApiAccess = apiAccess;
} else {
applicationContentUriRules += indentationChars + '<uap:Rule Type="include" WindowsRuntimeAccess="' + apiAccess + '" Match="' + accessUrl + '" />';
}
}
}
}
// Added base rule
applicationContentUriRules = '<uap:Rule Type="include" WindowsRuntimeAccess="' + baseApiAccess + '" Match="' + baseUrlPattern + '" />' + applicationContentUriRules;
replacedContent = replacedContent.replace(/{ApplicationContentUriRules}/g, applicationContentUriRules);
return replacedContent;
}
// Start CloudAppX
var makeAppx = function (appName, appFolder, callback) {
var options = { "dir": path.join(appFolder, 'manifest'), "name": appName, "out": appFolder };
cloudappx.makeappx(options).then(
function (output) {
callback && callback();
},
function (err) {
log.debug('Unable to create the package locally. Invoking the CloudAppX service instead...');
invokeCloudAppX(appName, appFolder, function (err) {
callback && callback(err);
});
}
);
}
function invokeCloudAppX(appName, appFolder, callback) {
var zipFile = path.join(appFolder, appName + '.zip');
var output = fs.createWriteStream(zipFile);
var archive = archiver('zip');
output.on('close', function () {
var uploadUrl = url.resolve(serviceEndpoint, '/v1/upload');
var req = request.post(uploadUrl, function (err, resp, body) {
if (err) {
return callback && callback(err);
}
fs.unlink(zipFile, function (err) {
if (err) {
return callback && callback(err);
}
if (resp.statusCode != 200) {
return callback && callback(new Error('Failed to create the package. The CloudAppX service returned an error: \'' + body + '\''));
}
var packageUrl = url.resolve(serviceEndpoint, body);
var req = request.get(packageUrl)
.on('response', function (res) {
var err;
if (res.statusCode == 200) {
var filename = path.join(appFolder, appName + '.appx');
res.pipe(fs.createWriteStream(filename));
}
else {
err = new Error('Failed to download the generated package. The CloudAppX service returned an error: \'' + res.statusMessage + '\'');
}
callback && callback(err);
})
.on('error', function (err) {
callback && callback(err);
});
});
});
var form = req.form();
form.append('xml', fs.createReadStream(zipFile));
});
archive.on('error', function (err) {
callback && callback(err);
});
archive.pipe(output);
var appContents = path.join(appFolder, 'manifest');
archive.directory(appContents, appName);
archive.finalize();
}
// End CloudAppX
module.exports = {
replaceManifestValues: replaceManifestValues,
makeAppx: makeAppx
}; |
<<<<<<<
|''Version''|0.6.7|
=======
|''Version''|0.6.6|
>>>>>>>
|''Version''|0.6.8|
<<<<<<<
if(isNewTiddler || !["public", "private"].contains(status)) {
var defaultValue = "public";
if(args.defaultValue) {
defaultValue = args.defaultValue[0].toLowerCase();
} else {
defaultValue = config.options.chkPrivateMode ? "private" : "public";
}
defaultValue = defaultValue ?
"%0_%1".format(currentSpace, defaultValue) : customFields["server.bag"];
=======
if(isNewTiddler || !["public", "private", "unsyncedPrivate", "unsyncedPublic"].contains(status)) {
var defaultValue = args.defaultValue;
defaultValue = defaultValue ? "%0_%1".format([currentSpace, defaultValue[0]]) : customFields["server.bag"];
>>>>>>>
if(isNewTiddler || !["public", "private", "unsyncedPrivate", "unsyncedPublic"].contains(status)) {
var defaultValue = "public";
if(args.defaultValue) {
defaultValue = args.defaultValue[0].toLowerCase();
} else {
defaultValue = config.options.chkPrivateMode ? "private" : "public";
}
defaultValue = defaultValue ?
"%0_%1".format(currentSpace, defaultValue) : customFields["server.bag"]; |
<<<<<<<
// Declare JSHint globals
/*global MobileServiceClient:false */
var testData = require('../utilities/constants');
=======
var testData = require('../utilities/constants');
>>>>>>>
/*global MobileServiceClient:false */
var testData = require('../utilities/constants'); |
<<<<<<<
"arc", "arrayCopy", "asin", "atan", "atan2", "background", "beginCamera",
"beginDraw", "beginShape", "bezier", "bezierDetail", "bezierPoint",
"bezierTangent", "bezierVertex", "binary", "blend", "blendColor",
"blit_resize", "blue", "box", "breakShape", "brightness",
"camera", "ceil", "Character", "clear", "color",
"colorMode", "concat", "console", "constrain", "copy", "cos", "createFont",
"createGraphics", "createImage", "cursor", "curve", "curveDetail",
"curvePoint", "curveTangent", "curveTightness", "curveVertex", "day",
"defaultColor", "degrees", "directionalLight", "disableContextMenu",
"dist", "draw", "ellipse", "ellipseMode", "emissive", "enableContextMenu",
"endCamera", "endDraw", "endShape", "exit", "exp", "expand", "externals",
"fill", "filter", "filter_bilinear", "filter_new_scanline",
"floor", "focused", "frameCount", "frameRate", "frustum", "get",
"glyphLook", "glyphTable", "green", "height", "hex", "hint", "hour", "hue",
"image", "imageMode", "Import", "intersect", "join", "key",
"keyCode", "keyPressed", "keyReleased", "keyTyped", "lerp", "lerpColor",
"lightFalloff", "lights", "lightSpecular", "line", "link", "loadBytes",
"loadFont", "loadGlyphs", "loadImage", "loadPixels", "loadShape",
"loadStrings", "log", "loop", "mag", "map", "match", "matchAll", "max",
"millis", "min", "minute", "mix", "modelX", "modelY", "modelZ", "modes",
"month", "mouseButton", "mouseClicked", "mouseDragged", "mouseMoved",
"mouseOut", "mouseOver", "mousePressed", "mouseReleased", "mouseScroll",
"mouseScrolled", "mouseX", "mouseY", "name", "nf", "nfc", "nfp", "nfs",
"noCursor", "noFill", "noise", "noiseDetail", "noiseSeed", "noLights",
"noLoop", "norm", "normal", "noSmooth", "noStroke", "noTint", "ortho",
"parseBoolean", "parseByte", "parseChar", "parseFloat", "parseInt",
"peg", "perspective", "PFont", "PImage", "pixels",
"PMatrix2D", "PMatrix3D", "PMatrixStack", "pmouseX", "pmouseY", "point",
"pointLight", "popMatrix", "popStyle", "pow", "print", "printCamera",
"println", "printMatrix", "printProjection", "PShape", "PShapeSVG",
"pushMatrix", "pushStyle", "quad", "radians", "random", "Random",
"randomSeed", "rect", "rectMode", "red", "redraw", "requestImage",
"resetMatrix", "reverse", "rotate", "rotateX", "rotateY", "rotateZ",
"round", "saturation", "save", "saveFrame", "saveStrings", "scale",
=======
"arc", "arrayCopy", "asin", "atan", "atan2", "background",
"beginCamera", "beginDraw", "beginShape", "bezier", "bezierDetail",
"bezierPoint", "bezierTangent", "bezierVertex", "binary", "blend",
"blendColor", "blit_resize", "blue", "boolean", "box", "breakShape",
"brightness", "byte", "camera", "ceil", "char", "Character", "clear",
"color", "colorMode", "concat", "console", "constrain", "copy", "cos",
"createFont", "createGraphics", "createImage", "cursor", "curve",
"curveDetail", "curvePoint", "curveTangent", "curveTightness",
"curveVertex", "day", "defaultColor", "degrees", "directionalLight",
"disableContextMenu", "dist", "draw", "ellipse", "ellipseMode", "emissive",
"enableContextMenu", "endCamera", "endDraw", "endShape", "exit", "exp",
"expand", "externals", "fill", "filter", "filter_bilinear",
"filter_new_scanline", "float", "floor", "focused", "frameCount",
"frameRate", "frustum", "get", "glyphLook", "glyphTable", "green",
"height", "hex", "hint", "hour", "hue", "image", "imageMode",
"Import", "int", "intersect", "join", "key", "keyCode", "keyPressed",
"keyReleased", "keyTyped", "lerp", "lerpColor", "lightFalloff", "lights",
"lightSpecular", "line", "link", "loadBytes", "loadFont", "loadGlyphs",
"loadImage", "loadPixels", "loadShape", "loadStrings", "log", "loop",
"mag", "map", "match", "matchAll", "max", "millis", "min", "minute", "mix",
"modelX", "modelY", "modelZ", "modes", "month", "mouseButton",
"mouseClicked", "mouseDragged", "mouseMoved", "mousePressed",
"mouseReleased", "mouseScroll", "mouseScrolled", "mouseX", "mouseY",
"name", "nf", "nfc", "nfp", "nfs", "noCursor", "noFill", "noise",
"noiseDetail", "noiseSeed", "noLights", "noLoop", "norm", "normal",
"noSmooth", "noStroke", "noTint", "ortho", "param", "peg", "perspective", "PFont", "PImage",
"pixels", "PMatrix2D", "PMatrix3D", "PMatrixStack", "pmouseX", "pmouseY",
"point", "pointLight", "popMatrix", "popStyle", "pow", "print",
"printCamera", "println", "printMatrix", "printProjection", "PShape","PShapeSVG",
"pushMatrix", "pushStyle", "quad", "radians", "random",
"Random", "randomSeed", "rect", "rectMode", "red", "redraw",
"requestImage", "resetMatrix", "reverse", "rotate", "rotateX", "rotateY",
"rotateZ", "round", "saturation", "save", "saveFrame", "saveStrings", "scale",
>>>>>>>
"arc", "arrayCopy", "asin", "atan", "atan2", "background", "beginCamera",
"beginDraw", "beginShape", "bezier", "bezierDetail", "bezierPoint",
"bezierTangent", "bezierVertex", "binary", "blend", "blendColor",
"blit_resize", "blue", "box", "breakShape", "brightness",
"camera", "ceil", "Character", "clear", "color",
"colorMode", "concat", "console", "constrain", "copy", "cos", "createFont",
"createGraphics", "createImage", "cursor", "curve", "curveDetail",
"curvePoint", "curveTangent", "curveTightness", "curveVertex", "day",
"defaultColor", "degrees", "directionalLight", "disableContextMenu",
"dist", "draw", "ellipse", "ellipseMode", "emissive", "enableContextMenu",
"endCamera", "endDraw", "endShape", "exit", "exp", "expand", "externals",
"fill", "filter", "filter_bilinear", "filter_new_scanline",
"floor", "focused", "frameCount", "frameRate", "frustum", "get",
"glyphLook", "glyphTable", "green", "height", "hex", "hint", "hour", "hue",
"image", "imageMode", "Import", "intersect", "join", "key",
"keyCode", "keyPressed", "keyReleased", "keyTyped", "lerp", "lerpColor",
"lightFalloff", "lights", "lightSpecular", "line", "link", "loadBytes",
"loadFont", "loadGlyphs", "loadImage", "loadPixels", "loadShape",
"loadStrings", "log", "loop", "mag", "map", "match", "matchAll", "max",
"millis", "min", "minute", "mix", "modelX", "modelY", "modelZ", "modes",
"month", "mouseButton", "mouseClicked", "mouseDragged", "mouseMoved",
"mouseOut", "mouseOver", "mousePressed", "mouseReleased", "mouseScroll",
"mouseScrolled", "mouseX", "mouseY", "name", "nf", "nfc", "nfp", "nfs",
"noCursor", "noFill", "noise", "noiseDetail", "noiseSeed", "noLights",
"noLoop", "norm", "normal", "noSmooth", "noStroke", "noTint", "ortho",
"param", "parseBoolean", "parseByte", "parseChar", "parseFloat", "parseInt",
"peg", "perspective", "PFont", "PImage", "pixels",
"PMatrix2D", "PMatrix3D", "PMatrixStack", "pmouseX", "pmouseY", "point",
"pointLight", "popMatrix", "popStyle", "pow", "print", "printCamera",
"println", "printMatrix", "printProjection", "PShape", "PShapeSVG",
"pushMatrix", "pushStyle", "quad", "radians", "random", "Random",
"randomSeed", "rect", "rectMode", "red", "redraw", "requestImage",
"resetMatrix", "reverse", "rotate", "rotateX", "rotateY", "rotateZ",
"round", "saturation", "save", "saveFrame", "saveStrings", "scale",
<<<<<<<
} else if (key === "globalKeyEvents") {
sketch.options.globalKeyEvents = value === "true";
=======
} else if (key.substring(0, 6) === "param-") {
sketch.params[key.substring(6)] = value;
>>>>>>>
} else if (key === "globalKeyEvents") {
sketch.options.globalKeyEvents = value === "true";
} else if (key.substring(0, 6) === "param-") {
sketch.params[key.substring(6)] = value; |
<<<<<<<
{ path: "stretch.pde", tags: ["3D"] },
{ path: "arc-fill-crisp.pde", tags: ["2D"], epsilonOverride: 0.07 },
=======
{ path: "mixture.pde", tags: ["3D"], knownFailureTicket: "1239" },
{ path: "mixturegrid.pde", tags: ["3D"], knownFailureTicket: "1239" },
{ path: "moveeye.pde", tags: ["3D"], epsilonOverride: 0.06 },
{ path: "directional.pde", tags: ["3D"] },
{ path: "disablestyle.pde", tags: ["2D"], epsilonOverride: 0.19 },
{ path: "icosahedron.pde", tags: ["3D"] },
{ path: "lights-off.pde", tags: ["3D"] },
{ path: "lights-on.pde", tags: ["3D"] },
{ path: "reflection.pde", tags: ["3D"] },
{ path: "perspective.pde", tags: ["3D"] },
{ path: "rotatepushpop.pde", tags: ["3D"] },
{ path: "rotatexy.pde", tags: ["3D"] },
{ path: "hue.pde", tags: ["2D"] },
{ path: "saturation.pde", tags: ["2D"] },
{ path: "brightness.pde", tags: ["2D"] },
{ path: "radialgradient.pde", tags: ["2D"] },
{ path: "wavegradient.pde", tags: ["2D"] },
{ path: "explode.pde", tags: ["3D"] },
{ path: "multiple-particle-systems.pde", tags: ["2D"] },
{ path: "pattern.pde", tags: ["2D"] },
{ path: "pixelarray.pde", tags: ["2D"] },
{ path: "pulses.pde", tags: ["2D"] },
{ path: "smoke-particle-system.pde", tags: ["2D"] },
{ path: "zoom.pde", tags: ["3D"], epsilonOverride: 0.07 },
>>>>>>>
{ path: "stretch.pde", tags: ["3D"] },
{ path: "arc-fill-crisp.pde", tags: ["2D"], epsilonOverride: 0.07 },
{ path: "mixture.pde", tags: ["3D"], knownFailureTicket: "1239" },
{ path: "mixturegrid.pde", tags: ["3D"], knownFailureTicket: "1239" },
{ path: "moveeye.pde", tags: ["3D"], epsilonOverride: 0.06 },
{ path: "directional.pde", tags: ["3D"] },
{ path: "disablestyle.pde", tags: ["2D"], epsilonOverride: 0.19 },
{ path: "icosahedron.pde", tags: ["3D"] },
{ path: "lights-off.pde", tags: ["3D"] },
{ path: "lights-on.pde", tags: ["3D"] },
{ path: "reflection.pde", tags: ["3D"] },
{ path: "perspective.pde", tags: ["3D"] },
{ path: "rotatepushpop.pde", tags: ["3D"] },
{ path: "rotatexy.pde", tags: ["3D"] },
{ path: "hue.pde", tags: ["2D"] },
{ path: "saturation.pde", tags: ["2D"] },
{ path: "brightness.pde", tags: ["2D"] },
{ path: "radialgradient.pde", tags: ["2D"] },
{ path: "wavegradient.pde", tags: ["2D"] },
{ path: "explode.pde", tags: ["3D"] },
{ path: "multiple-particle-systems.pde", tags: ["2D"] },
{ path: "pattern.pde", tags: ["2D"] },
{ path: "pixelarray.pde", tags: ["2D"] },
{ path: "pulses.pde", tags: ["2D"] },
{ path: "smoke-particle-system.pde", tags: ["2D"] },
{ path: "zoom.pde", tags: ["3D"], epsilonOverride: 0.07 }, |
<<<<<<<
allRest = RegExp.rightContext,
rest = nextBrace(allRest, "{", "}");
className = m[1],
staticVars = m[2] || "";
allRest = allRest.slice(rest.length + 1);
=======
allRest = RegExp.rightContext,
rest = nextBrace(allRest),
className = m[1];
allRest = allRest.slice(rest.length + 1);
// Fix class method names
// this.collide = function() { ... }
rest = (function() {
return rest.replace(/(?:public\s+)?processing.\w+ = function (\w+)\(([^\)]*?)\)/g, function(all, name, args) {
return "ADDMETHOD(this, '" + name + "', (function(public) { return function(" + args + ")";
});
}());
var matchMethod = /ADDMETHOD([^,]+, \s*?')([^']*)('[\s\S]*?\{[^\{]*?\{)/,
mc,
methods = "",
methodsArray = [];
while ((mc = rest.match(matchMethod))) {
var prev = RegExp.leftContext,
allNext = RegExp.rightContext,
next = nextBrace(allNext);
methodsArray.push("addMethod" + mc[1] + mc[2] + mc[3] + next + "};})(this));" + "var " + mc[2] + " = this." + mc[2] + ";\n");
rest = prev + allNext.slice(next.length + 1);
}
>>>>>>>
allRest = RegExp.rightContext,
rest = nextBrace(allRest),
className = m[1];
allRest = allRest.slice(rest.length + 1);
// Fix class method names
// this.collide = function() { ... }
rest = (function() {
return rest.replace(/(?:public\s+)?processing.\w+ = function (\w+)\(([^\)]*?)\)/g, function(all, name, args) {
return "ADDMETHOD(this, '" + name + "', (function(public) { return function(" + args + ")";
});
}());
var matchMethod = /ADDMETHOD([^,]+, \s*?')([^']*)('[\s\S]*?\{[^\{]*?\{)/,
mc,
methods = "",
methodsArray = [];
while ((mc = rest.match(matchMethod))) {
var prev = RegExp.leftContext,
allNext = RegExp.rightContext,
next = nextBrace(allNext);
methodsArray.push("addMethod" + mc[1] + mc[2] + mc[3] + next + "};})(this));" + "var " + mc[2] + " = this." + mc[2] + ";\n");
rest = prev + allNext.slice(next.length + 1);
}
<<<<<<<
rest = prev + allNext.slice(next.length + 1);
}
// Fix class method names
// this.collide = function() { ... }
rest = (function() {
return rest.replace(/(?:public\s+)?processing.\w+ = function (\w+)\((.*?)\)/g, function(all, name, args) {
return "ADDMETHOD(this, '" + name + "', (function(public) { return function(" + args + ")";
});
}());
var matchMethod = /ADDMETHOD([^,]+, \s*?')([^']*)('[\s\S]*?\{[\s\S]*?\{)/,
mc,
methods = "",
methodsArray = [];
while ((mc = rest.match(matchMethod))) {
var prev = RegExp.leftContext,
allNext = RegExp.rightContext,
next = nextBrace(allNext, "{", "}");
methodsArray.push("addMethod" + mc[1] + mc[2] + mc[3] + next + "};})(this));" + "var " + mc[2] + " = this." + mc[2] + ";\n");
=======
>>>>>>> |
<<<<<<<
=======
inDraw = true;
var pmouseXLastEvent = p.pmouseX,
pmouseYLastEvent = p.pmouseY;
p.pmouseX = pmouseXLastFrame;
p.pmouseY = pmouseYLastFrame;
>>>>>>>
var pmouseXLastEvent = p.pmouseX,
pmouseYLastEvent = p.pmouseY;
p.pmouseX = pmouseXLastFrame;
p.pmouseY = pmouseYLastFrame;
<<<<<<<
=======
pmouseXLastFrame = p.mouseX;
pmouseYLastFrame = p.mouseY;
p.pmouseX = pmouseXLastEvent;
p.pmouseY = pmouseYLastEvent;
inDraw = false;
>>>>>>>
pmouseXLastFrame = p.mouseX;
pmouseYLastFrame = p.mouseY;
p.pmouseX = pmouseXLastEvent;
p.pmouseY = pmouseYLastEvent;
<<<<<<<
=======
inDraw = true;
var pmouseXLastEvent = p.pmouseX,
pmouseYLastEvent = p.pmouseY;
p.pmouseX = pmouseXLastFrame;
p.pmouseY = pmouseYLastFrame;
>>>>>>>
var pmouseXLastEvent = p.pmouseX,
pmouseYLastEvent = p.pmouseY;
p.pmouseX = pmouseXLastFrame;
p.pmouseY = pmouseYLastFrame;
<<<<<<<
=======
pmouseXLastFrame = p.mouseX;
pmouseYLastFrame = p.mouseY;
p.pmouseX = pmouseXLastEvent;
p.pmouseY = pmouseYLastEvent;
inDraw = false;
>>>>>>>
pmouseXLastFrame = p.mouseX;
pmouseYLastFrame = p.mouseY;
p.pmouseX = pmouseXLastEvent;
p.pmouseY = pmouseYLastEvent; |
<<<<<<<
{ path: "text-unboxed-left-bottom-3D.pde", tags:["3D", "Text"], knownFailureTicket: "750" },
{ path: "text-unboxed-center-top.pde", tags:["2D", "Text"], epsilonOverride: 0.10 }, /* See ticket #1172 */
{ path: "text-unboxed-center-top-3D.pde", tags:["3D", "Text"], knownFailureTicket: "750" },
{ path: "text-unboxed-center-center.pde", tags:["2D", "Text"], epsilonOverride: 0.11 }, /* See ticket #1172 */
{ path: "text-unboxed-center-center-3D.pde", tags:["3D", "Text"], knownFailureTicket: "750" },
{ path: "text-unboxed-center-bottom.pde", tags:["2D", "Text"], epsilonOverride: 0.10 }, /* See ticket #1172 */
{ path: "text-unboxed-center-bottom-3D.pde", tags:["3D", "Text"], knownFailureTicket: "750" },
=======
{ path: "text-unboxed-center-top.pde", tags:["2D", "Text"], epsilonOverride: 0.11 }, /* See ticket #1172 */
{ path: "text-unboxed-center-center.pde", tags:["2D", "Text"], epsilonOverride: 0.12 }, /* See ticket #1172 */
{ path: "text-unboxed-center-bottom.pde", tags:["2D", "Text"], epsilonOverride: 0.11 }, /* See ticket #1172 */
>>>>>>>
{ path: "text-unboxed-left-bottom-3D.pde", tags:["3D", "Text"], knownFailureTicket: "750" },
{ path: "text-unboxed-center-top.pde", tags:["2D", "Text"], epsilonOverride: 0.11 }, /* See ticket #1172 */
{ path: "text-unboxed-center-top-3D.pde", tags:["3D", "Text"], knownFailureTicket: "750" },
{ path: "text-unboxed-center-center.pde", tags:["2D", "Text"], epsilonOverride: 0.12 }, /* See ticket #1172 */
{ path: "text-unboxed-center-center-3D.pde", tags:["3D", "Text"], knownFailureTicket: "750" },
{ path: "text-unboxed-center-bottom.pde", tags:["2D", "Text"], epsilonOverride: 0.11 }, /* See ticket #1172 */
{ path: "text-unboxed-center-bottom-3D.pde", tags:["3D", "Text"], knownFailureTicket: "750" }, |
<<<<<<<
=======
{ path: "textWidth_comic.pde", tags:["2D"], epsilonOverride: 0.35}, /* See ticket #1172 */
{ path: "image-3d.pde", tags: ["3D"], epsilonOverride: 0.07 },
>>>>>>>
{ path: "image-3d.pde", tags: ["3D"], epsilonOverride: 0.07 }, |
<<<<<<<
var colors = {
aliceblue: "#f0f8ff",
antiquewhite: "#faebd7",
aqua: "#00ffff",
aquamarine: "#7fffd4",
azure: "#f0ffff",
beige: "#f5f5dc",
bisque: "#ffe4c4",
black: "#000000",
blanchedalmond: "#ffebcd",
blue: "#0000ff",
blueviolet: "#8a2be2",
brown: "#a52a2a",
burlywood: "#deb887",
cadetblue: "#5f9ea0",
chartreuse: "#7fff00",
chocolate: "#d2691e",
coral: "#ff7f50",
cornflowerblue: "#6495ed",
cornsilk: "#fff8dc",
crimson: "#dc143c",
cyan: "#00ffff",
darkblue: "#00008b",
darkcyan: "#008b8b",
darkgoldenrod: "#b8860b",
darkgray: "#a9a9a9",
darkgreen: "#006400",
darkkhaki: "#bdb76b",
darkmagenta: "#8b008b",
darkolivegreen: "#556b2f",
darkorange: "#ff8c00",
darkorchid: "#9932cc",
darkred: "#8b0000",
darksalmon: "#e9967a",
darkseagreen: "#8fbc8f",
darkslateblue: "#483d8b",
darkslategray: "#2f4f4f",
darkturquoise: "#00ced1",
darkviolet: "#9400d3",
deeppink: "#ff1493",
deepskyblue: "#00bfff",
dimgray: "#696969",
dodgerblue: "#1e90ff",
firebrick: "#b22222",
floralwhite: "#fffaf0",
forestgreen: "#228b22",
fuchsia: "#ff00ff",
gainsboro: "#dcdcdc",
ghostwhite: "#f8f8ff",
gold: "#ffd700",
goldenrod: "#daa520",
gray: "#808080",
green: "#008000",
greenyellow: "#adff2f",
honeydew: "#f0fff0",
hotpink: "#ff69b4",
indianred: "#cd5c5c",
indigo: "#4b0082",
ivory: "#fffff0",
khaki: "#f0e68c",
lavender: "#e6e6fa",
lavenderblush: "#fff0f5",
lawngreen: "#7cfc00",
lemonchiffon: "#fffacd",
lightblue: "#add8e6",
lightcoral: "#f08080",
lightcyan: "#e0ffff",
lightgoldenrodyellow: "#fafad2",
lightgrey: "#d3d3d3",
lightgreen: "#90ee90",
lightpink: "#ffb6c1",
lightsalmon: "#ffa07a",
lightseagreen: "#20b2aa",
lightskyblue: "#87cefa",
lightslategray: "#778899",
lightsteelblue: "#b0c4de",
lightyellow: "#ffffe0",
lime: "#00ff00",
limegreen: "#32cd32",
linen: "#faf0e6",
magenta: "#ff00ff",
maroon: "#800000",
mediumaquamarine: "#66cdaa",
mediumblue: "#0000cd",
mediumorchid: "#ba55d3",
mediumpurple: "#9370d8",
mediumseagreen: "#3cb371",
mediumslateblue: "#7b68ee",
mediumspringgreen: "#00fa9a",
mediumturquoise: "#48d1cc",
mediumvioletred: "#c71585",
midnightblue: "#191970",
mintcream: "#f5fffa",
mistyrose: "#ffe4e1",
moccasin: "#ffe4b5",
navajowhite: "#ffdead",
navy: "#000080",
oldlace: "#fdf5e6",
olive: "#808000",
olivedrab: "#6b8e23",
orange: "#ffa500",
orangered: "#ff4500",
orchid: "#da70d6",
palegoldenrod: "#eee8aa",
palegreen: "#98fb98",
paleturquoise: "#afeeee",
palevioletred: "#d87093",
papayawhip: "#ffefd5",
peachpuff: "#ffdab9",
peru: "#cd853f",
pink: "#ffc0cb",
plum: "#dda0dd",
powderblue: "#b0e0e6",
purple: "#800080",
red: "#ff0000",
rosybrown: "#bc8f8f",
royalblue: "#4169e1",
saddlebrown: "#8b4513",
salmon: "#fa8072",
sandybrown: "#f4a460",
seagreen: "#2e8b57",
seashell: "#fff5ee",
sienna: "#a0522d",
silver: "#c0c0c0",
skyblue: "#87ceeb",
slateblue: "#6a5acd",
slategray: "#708090",
snow: "#fffafa",
springgreen: "#00ff7f",
steelblue: "#4682b4",
tan: "#d2b48c",
teal: "#008080",
thistle: "#d8bfd8",
tomato: "#ff6347",
turquoise: "#40e0d0",
violet: "#ee82ee",
wheat: "#f5deb3",
white: "#ffffff",
whitesmoke: "#f5f5f5",
yellow: "#ffff00",
yellowgreen: "#9acd32"
};
var Processing = this.Processing = function Processing(curElement, aCode) {
=======
var Processing = this.Processing = function(curElement, aCode) {
>>>>>>>
var colors = {
aliceblue: "#f0f8ff",
antiquewhite: "#faebd7",
aqua: "#00ffff",
aquamarine: "#7fffd4",
azure: "#f0ffff",
beige: "#f5f5dc",
bisque: "#ffe4c4",
black: "#000000",
blanchedalmond: "#ffebcd",
blue: "#0000ff",
blueviolet: "#8a2be2",
brown: "#a52a2a",
burlywood: "#deb887",
cadetblue: "#5f9ea0",
chartreuse: "#7fff00",
chocolate: "#d2691e",
coral: "#ff7f50",
cornflowerblue: "#6495ed",
cornsilk: "#fff8dc",
crimson: "#dc143c",
cyan: "#00ffff",
darkblue: "#00008b",
darkcyan: "#008b8b",
darkgoldenrod: "#b8860b",
darkgray: "#a9a9a9",
darkgreen: "#006400",
darkkhaki: "#bdb76b",
darkmagenta: "#8b008b",
darkolivegreen: "#556b2f",
darkorange: "#ff8c00",
darkorchid: "#9932cc",
darkred: "#8b0000",
darksalmon: "#e9967a",
darkseagreen: "#8fbc8f",
darkslateblue: "#483d8b",
darkslategray: "#2f4f4f",
darkturquoise: "#00ced1",
darkviolet: "#9400d3",
deeppink: "#ff1493",
deepskyblue: "#00bfff",
dimgray: "#696969",
dodgerblue: "#1e90ff",
firebrick: "#b22222",
floralwhite: "#fffaf0",
forestgreen: "#228b22",
fuchsia: "#ff00ff",
gainsboro: "#dcdcdc",
ghostwhite: "#f8f8ff",
gold: "#ffd700",
goldenrod: "#daa520",
gray: "#808080",
green: "#008000",
greenyellow: "#adff2f",
honeydew: "#f0fff0",
hotpink: "#ff69b4",
indianred: "#cd5c5c",
indigo: "#4b0082",
ivory: "#fffff0",
khaki: "#f0e68c",
lavender: "#e6e6fa",
lavenderblush: "#fff0f5",
lawngreen: "#7cfc00",
lemonchiffon: "#fffacd",
lightblue: "#add8e6",
lightcoral: "#f08080",
lightcyan: "#e0ffff",
lightgoldenrodyellow: "#fafad2",
lightgrey: "#d3d3d3",
lightgreen: "#90ee90",
lightpink: "#ffb6c1",
lightsalmon: "#ffa07a",
lightseagreen: "#20b2aa",
lightskyblue: "#87cefa",
lightslategray: "#778899",
lightsteelblue: "#b0c4de",
lightyellow: "#ffffe0",
lime: "#00ff00",
limegreen: "#32cd32",
linen: "#faf0e6",
magenta: "#ff00ff",
maroon: "#800000",
mediumaquamarine: "#66cdaa",
mediumblue: "#0000cd",
mediumorchid: "#ba55d3",
mediumpurple: "#9370d8",
mediumseagreen: "#3cb371",
mediumslateblue: "#7b68ee",
mediumspringgreen: "#00fa9a",
mediumturquoise: "#48d1cc",
mediumvioletred: "#c71585",
midnightblue: "#191970",
mintcream: "#f5fffa",
mistyrose: "#ffe4e1",
moccasin: "#ffe4b5",
navajowhite: "#ffdead",
navy: "#000080",
oldlace: "#fdf5e6",
olive: "#808000",
olivedrab: "#6b8e23",
orange: "#ffa500",
orangered: "#ff4500",
orchid: "#da70d6",
palegoldenrod: "#eee8aa",
palegreen: "#98fb98",
paleturquoise: "#afeeee",
palevioletred: "#d87093",
papayawhip: "#ffefd5",
peachpuff: "#ffdab9",
peru: "#cd853f",
pink: "#ffc0cb",
plum: "#dda0dd",
powderblue: "#b0e0e6",
purple: "#800080",
red: "#ff0000",
rosybrown: "#bc8f8f",
royalblue: "#4169e1",
saddlebrown: "#8b4513",
salmon: "#fa8072",
sandybrown: "#f4a460",
seagreen: "#2e8b57",
seashell: "#fff5ee",
sienna: "#a0522d",
silver: "#c0c0c0",
skyblue: "#87ceeb",
slateblue: "#6a5acd",
slategray: "#708090",
snow: "#fffafa",
springgreen: "#00ff7f",
steelblue: "#4682b4",
tan: "#d2b48c",
teal: "#008080",
thistle: "#d8bfd8",
tomato: "#ff6347",
turquoise: "#40e0d0",
violet: "#ee82ee",
wheat: "#f5deb3",
white: "#ffffff",
whitesmoke: "#f5f5f5",
yellow: "#ffff00",
yellowgreen: "#9acd32"
};
var Processing = this.Processing = function(curElement, aCode) {
<<<<<<<
p.createGraphics = function createGraphics(w, h, render) {
var pg = new Processing();
=======
p.createGraphics = function(w, h, render) {
var canvas = document.createElement("canvas");
var pg = new Processing(canvas);
>>>>>>>
p.createGraphics = function(w, h, render) {
var pg = new Processing();
<<<<<<<
p.extendInterfaceMembers = function(derived, base) {
extendClass(derived, base);
};
p.addMethod = function addMethod(object, name, fn, superAccessor) {
=======
p.addMethod = function(object, name, fn, superAccessor) {
>>>>>>>
p.extendInterfaceMembers = function(derived, base) {
extendClass(derived, base);
};
p.addMethod = function(object, name, fn, superAccessor) { |
<<<<<<<
{ path: "plants.pde", tags: ["2D"] },
{ path: "alpha-transparency-mask.pde", tags: ["2D"], iterationOverride: 100 },
{ path: "tint.pde", tags: ["2D"], iterationOverride: 100 },
{ path: "point-notcrisp.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "point-crisp.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "point-arc.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "rect-notcrisp.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "rect-crisp.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "line-notcrisp.pde", tags: ["2D", "Crisp"] },
{ path: "line-crisp.pde", tags: ["2D", "Crisp"] }
=======
{ path: "lerpcolor-rgb.pde", tags: ["2D", "lerpColor"] },
{ path: "lerpcolor-hsb.pde", tags: ["2D", "lerpColor"] },
{ path: "plants.pde", tags: ["2D"] }
>>>>>>>
{ path: "plants.pde", tags: ["2D"] },
{ path: "alpha-transparency-mask.pde", tags: ["2D"], iterationOverride: 100 },
{ path: "tint.pde", tags: ["2D"], iterationOverride: 100 },
{ path: "point-notcrisp.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "point-crisp.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "point-arc.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "rect-notcrisp.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "rect-crisp.pde", tags: ["2D", "Crisp"], iterationOverride: 10 },
{ path: "line-notcrisp.pde", tags: ["2D", "Crisp"] },
{ path: "line-crisp.pde", tags: ["2D", "Crisp"] },
{ path: "lerpcolor-rgb.pde", tags: ["2D", "lerpColor"] },
{ path: "lerpcolor-hsb.pde", tags: ["2D", "lerpColor"] } |
<<<<<<<
return [0, 0, max];
}
saturation = (max - min) / max;
=======
return [0, 0, max*colorModeZ];
} else {
saturation = (max - min) / max;
>>>>>>>
return [0, 0, max*colorModeZ];
}
saturation = (max - min) / max; |
<<<<<<<
p.endShape = function endShape(mode){
if (vertArray.length === 0) { return; }
=======
Drawing2D.prototype.endShape = function(mode) {
// Duplicated in Drawing3D; too many variables used
>>>>>>>
Drawing2D.prototype.endShape = function(mode) {
// Duplicated in Drawing3D; too many variables used
if (vertArray.length === 0) { return; } |
<<<<<<<
// process all <canvas>-indicated sketches
var canvasElements = document.getElementsByTagName('canvas');
var filenames;
for (var i = 0, l = canvasElements.length; i < l; i++) {
=======
/**
* Automatic initialization function.
*/
var init = function() {
var canvas = document.getElementsByTagName('canvas');
for (var i = 0, l = canvas.length; i < l; i++) {
>>>>>>>
/**
* Automatic initialization function.
*/
var init = function() {
var canvas = document.getElementsByTagName('canvas');
for (var i = 0, l = canvas.length; i < l; i++) {
<<<<<<<
loadAndExecute(canvasElements[i], filenames);
}
}
// process all <script>-indicated sketches
var scripts = document.getElementsByTagName('script');
var s, source, instance;
for (s = 0; s < scripts.length; s++) {
var script = scripts[s];
if (!script.getAttribute) {
continue;
}
var type = script.getAttribute("type");
if (type && (type.toLowerCase() === "text/processing" || type.toLowerCase() === "application/processing")) {
var target = script.getAttribute("data-target");
var canvas;
if (target) {
canvas = document.getElementById(target);
} else {
var nextSibling = script.nextSibling;
while (nextSibling && nextSibling.nodeType !== 1) {
nextSibling = nextSibling.nextSibling;
}
if (nextSibling.nodeName.toLowerCase() === "canvas") {
canvas = nextSibling;
}
}
if (canvas && canvas !== null) {
if (script.getAttribute("src")) {
filenames = script.getAttribute("src").split(/\s+/);
loadAndExecute(canvas, filenames);
continue;
}
source = script.innerText || script.textContent;
instance = new Processing(canvas, source);
}
=======
loadSketchFromSources(canvas[i], filenames);
>>>>>>>
loadAndExecute(canvasElements[i], filenames);
}
}
// process all <script>-indicated sketches
var scripts = document.getElementsByTagName('script');
var s, source, instance;
for (s = 0; s < scripts.length; s++) {
var script = scripts[s];
if (!script.getAttribute) {
continue;
}
var type = script.getAttribute("type");
if (type && (type.toLowerCase() === "text/processing" || type.toLowerCase() === "application/processing")) {
var target = script.getAttribute("data-target");
var canvas;
if (target) {
canvas = document.getElementById(target);
} else {
var nextSibling = script.nextSibling;
while (nextSibling && nextSibling.nodeType !== 1) {
nextSibling = nextSibling.nextSibling;
}
if (nextSibling.nodeName.toLowerCase() === "canvas") {
canvas = nextSibling;
}
}
if (canvas && canvas !== null) {
if (script.getAttribute("src")) {
filenames = script.getAttribute("src").split(/\s+/);
loadAndExecute(canvas, filenames);
continue;
}
source = script.innerText || script.textContent;
instance = new Processing(canvas, source);
}
loadSketchFromSources(canvas[i], filenames);
<<<<<<<
document.addEventListener('DOMContentLoaded', function() {
init();
}, false);
=======
document.addEventListener('DOMContentLoaded', init, false);
>>>>>>>
document.addEventListener('DOMContentLoaded', init, false); |
<<<<<<<
disableVertexAttribPointer(programObject3D, "aTexture");
uniformMatrix(programObject3D, "model", true, model.array());
uniformMatrix(programObject3D, "view", true, view.array());
uniformMatrix(programObject3D, "projection", true, projection.array());
=======
uniformMatrix(programObject3D, "model", false, model.array());
uniformMatrix(programObject3D, "view", false, view.array());
uniformMatrix(programObject3D, "projection", false, proj.array());
>>>>>>>
disableVertexAttribPointer(programObject3D, "aTexture");
uniformMatrix(programObject3D, "model", false, model.array());
uniformMatrix(programObject3D, "view", false, view.array());
uniformMatrix(programObject3D, "projection", false, proj.array());
<<<<<<<
disableVertexAttribPointer(programObject3D, "aTexture");
uniformMatrix(programObject3D, "model", true, model.array());
uniformMatrix(programObject3D, "view", true, view.array());
uniformMatrix(programObject3D, "projection", true, projection.array());
=======
uniformMatrix(programObject3D, "model", false, model.array());
uniformMatrix(programObject3D, "view", false, view.array());
uniformMatrix(programObject3D, "projection", false, proj.array());
>>>>>>>
disableVertexAttribPointer(programObject3D, "aTexture");
uniformMatrix(programObject3D, "model", false, model.array());
uniformMatrix(programObject3D, "view", false, view.array());
uniformMatrix(programObject3D, "projection", false, proj.array());
<<<<<<<
// No support for lights....yet
disableVertexAttribPointer(programObject3D, "Normal");
if(usingTexture){
if(curTextureMode === p.IMAGE){
for(var i = 0; i < tArray.length; i += 2){
tArray[i] = tArray[i]/curTexture.width;
tArray[i+1] /= curTexture.height;
}
}
// hack to handle when users specifies values
// greater than 1.0 for texture coords.
for(var i = 0; i < tArray.length; i += 2){
if( tArray[i+0] > 1.0 ){ tArray[i+0] -= (tArray[i+0] - 1.0);}
if( tArray[i+1] > 1.0 ){ tArray[i+1] -= (tArray[i+1] - 1.0);}
}
uniformi(programObject3D, "usingTexture", usingTexture);
vertexAttribPointer(programObject3D, "aTexture", 2, shapeTexVBO);
curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(tArray), curContext.STREAM_DRAW);
}
curContext.drawArrays( ctxMode, 0, (vArray.length/3) );
=======
disableVertexAttribPointer(programObject3D, "Normal");
curContext.drawArrays( ctxMode, 0, vArray.length/3 );
>>>>>>>
// No support for lights....yet
disableVertexAttribPointer(programObject3D, "Normal");
if(usingTexture){
if(curTextureMode === p.IMAGE){
for(var i = 0; i < tArray.length; i += 2){
tArray[i] = tArray[i]/curTexture.width;
tArray[i+1] /= curTexture.height;
}
}
// hack to handle when users specifies values
// greater than 1.0 for texture coords.
for(var i = 0; i < tArray.length; i += 2){
if( tArray[i+0] > 1.0 ){ tArray[i+0] -= (tArray[i+0] - 1.0);}
if( tArray[i+1] > 1.0 ){ tArray[i+1] -= (tArray[i+1] - 1.0);}
}
uniformi(programObject3D, "usingTexture", usingTexture);
vertexAttribPointer(programObject3D, "aTexture", 2, shapeTexVBO);
curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(tArray), curContext.STREAM_DRAW);
}
curContext.drawArrays( ctxMode, 0, vArray.length/3 );
<<<<<<<
uniformi(programObject2D, "picktype", 0);
=======
uniformMatrix(programObject2D, "model", false, [1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1]);
uniformMatrix(programObject2D, "view", false, view.array());
uniformMatrix(programObject2D, "projection", false, proj.array());
>>>>>>>
uniformi(programObject2D, "picktype", 0);
uniformMatrix(programObject2D, "model", false, [1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1]);
uniformMatrix(programObject2D, "view", false, view.array());
uniformMatrix(programObject2D, "projection", false, proj.array()); |
<<<<<<<
fillStyle = "rgba( 255, 255, 255, 1 )",
currentFillColor = 0xFFFFFFFF,
isFillDirty = false,
=======
fillStyle = [1.0, 1.0, 1.0, 1.0],
>>>>>>>
fillStyle = [1.0, 1.0, 1.0, 1.0],
currentFillColor = 0xFFFFFFFF,
isFillDirty = false,
<<<<<<<
strokeStyle = "rgba( 204, 204, 204, 1 )",
currentStrokeColor = 0xFFFDFDFD,
isStrokeDirty = false,
=======
strokeStyle = [0.8, 0.8, 0.8, 1.0],
>>>>>>>
strokeStyle = [0.8, 0.8, 0.8, 1.0],
currentStrokeColor = 0xFFFDFDFD,
isStrokeDirty = false,
<<<<<<<
pointBuffer,
// Pixels cache
originalContext,
proxyContext = null,
isContextReplaced = false,
setPixelsCached,
maxPixelsCached = 1000;
=======
pointBuffer,
shapeTexVBO,
curTexture = {width:0,height:0},
curTextureMode = p.IMAGE,
usingTexture = false,
textBuffer,
textureBuffer,
indexBuffer;
// Work-around for Minefield. using ctx.VERTEX_PROGRAM_POINT_SIZE
// in Minefield does nothing and does not report any errors.
var VERTEX_PROGRAM_POINT_SIZE = 0x8642;
var POINT_SMOOTH = 0x0B10;
>>>>>>>
pointBuffer,
shapeTexVBO,
curTexture = {width:0,height:0},
curTextureMode = p.IMAGE,
usingTexture = false,
textBuffer,
textureBuffer,
indexBuffer,
// Pixels cache
originalContext,
proxyContext = null,
isContextReplaced = false,
setPixelsCached,
maxPixelsCached = 1000;
// Work-around for Minefield. using ctx.VERTEX_PROGRAM_POINT_SIZE
// in Minefield does nothing and does not report any errors.
var VERTEX_PROGRAM_POINT_SIZE = 0x8642;
var POINT_SMOOTH = 0x0B10;
<<<<<<<
lineWidth = w;
if (!p.use3DContext) {
=======
if (p.use3DContext) {
lineWidth = w;
curContext.useProgram(programObject2D);
uniformf(programObject2D, "pointSize", w);
} else {
>>>>>>>
lineWidth = w;
if (p.use3DContext) {
curContext.useProgram(programObject2D);
uniformf(programObject2D, "pointSize", w);
} else {
<<<<<<<
p.Point = function Point(x, y) {
this.x = x;
this.y = y;
this.copy = function() {
return new Point(x, y);
};
};
function colorBlendWithAlpha(c1, c2, k) {
var f = 0|(k * ((c2 & p.ALPHA_MASK) >>> 24));
return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | p.mix(c1 & p.RED_MASK, c2 & p.RED_MASK, f) & p.RED_MASK | p.mix(c1 & p.GREEN_MASK, c2 & p.GREEN_MASK, f) & p.GREEN_MASK | p.mix(c1 & p.BLUE_MASK, c2 & p.BLUE_MASK, f));
}
=======
>>>>>>>
function colorBlendWithAlpha(c1, c2, k) {
var f = 0|(k * ((c2 & p.ALPHA_MASK) >>> 24));
return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | p.mix(c1 & p.RED_MASK, c2 & p.RED_MASK, f) & p.RED_MASK | p.mix(c1 & p.GREEN_MASK, c2 & p.GREEN_MASK, f) & p.GREEN_MASK | p.mix(c1 & p.BLUE_MASK, c2 & p.BLUE_MASK, f));
}
<<<<<<<
curContext.beginPath();
curContext.moveTo(vertArray[0][0], vertArray[0][1]);
for(i = 1; i < vertArray.length; i++){
curContext.bezierCurveTo(vertArray[i][0], vertArray[i][1], vertArray[i][2], vertArray[i][3], vertArray[i][4], vertArray[i][5]);
}
if(ensureFillSet()){
curContext.fill();
}
if(ensureStrokeSet()){
curContext.stroke();
}
curContext.closePath();
}
else{
if(p.use3DContext){ // 3D context
var lineVertArray = [];
var fillVertArray = [];
var colorVertArray = [];
var strokeVertArray = [];
for(i = 0; i < vertArray.length; i++){
=======
if(p.use3DContext){
lineVertArray = fillVertArray;
lineVertArray.splice(lineVertArray.length - 3);
strokeVertArray.splice(strokeVertArray.length - 4);
if(doStroke){
line3D(lineVertArray, null, strokeVertArray);
}
if(doFill){
fill3D(fillVertArray, "TRIANGLES", colorVertArray);
}
/*fillVertArray = []; //***Fill not properly working yet*** will fix later
colorVertArray = [];
tempArray.reverse();
for(i = 0; (i+1) < 10; i++){
for(j = 0; j < 3; j++){
fillVertArray.push(tempArray[i][j]);
}
for(j = 5; j < 9; j++){
colorVertArray.push(tempArray[i][j]);
}
>>>>>>>
if(p.use3DContext){
lineVertArray = fillVertArray;
lineVertArray.splice(lineVertArray.length - 3);
strokeVertArray.splice(strokeVertArray.length - 4);
if(doStroke){
line3D(lineVertArray, null, strokeVertArray);
}
if(doFill){
fill3D(fillVertArray, "TRIANGLES", colorVertArray);
}
/*fillVertArray = []; //***Fill not properly working yet*** will fix later
colorVertArray = [];
tempArray.reverse();
for(i = 0; (i+1) < 10; i++){
for(j = 0; j < 3; j++){
fillVertArray.push(tempArray[i][j]);
}
for(j = 5; j < 9; j++){
colorVertArray.push(tempArray[i][j]);
}
<<<<<<<
var offsetStart = 0;
var offsetEnd = 0;
=======
// viewing transformation needs to have Y flipped
// becuase that's what Processing does.
var view = new PMatrix3D();
view.scale(1, -1, 1);
view.apply(modelView.array());
if (lineWidth > 0 && doStroke) {
curContext.useProgram(programObject2D);
uniformMatrix(programObject2D, "model", true, model.array());
uniformMatrix(programObject2D, "view", true, view.array());
uniformMatrix(programObject2D, "projection", true, projection.array());
uniformf(programObject2D, "color", strokeStyle);
curContext.lineWidth(lineWidth);
vertexAttribPointer(programObject2D, "Vertex", 3, rectBuffer);
curContext.drawArrays(curContext.LINE_LOOP, 0, rectVerts.length / 3);
}
if (doFill) {
curContext.useProgram(programObject3D);
uniformMatrix(programObject3D, "model", true, model.array());
uniformMatrix(programObject3D, "view", true, view.array());
uniformMatrix(programObject3D, "projection", true, projection.array());
>>>>>>>
// viewing transformation needs to have Y flipped
// becuase that's what Processing does.
var view = new PMatrix3D();
view.scale(1, -1, 1);
view.apply(modelView.array());
if (lineWidth > 0 && doStroke) {
curContext.useProgram(programObject2D);
uniformMatrix(programObject2D, "model", true, model.array());
uniformMatrix(programObject2D, "view", true, view.array());
uniformMatrix(programObject2D, "projection", true, projection.array());
uniformf(programObject2D, "color", strokeStyle);
curContext.lineWidth(lineWidth);
vertexAttribPointer(programObject2D, "Vertex", 3, rectBuffer);
curContext.drawArrays(curContext.LINE_LOOP, 0, rectVerts.length / 3);
}
if (doFill) {
curContext.useProgram(programObject3D);
uniformMatrix(programObject3D, "model", true, model.array());
uniformMatrix(programObject3D, "view", true, view.array());
uniformMatrix(programObject3D, "projection", true, projection.array());
<<<<<<<
if (ensureFillSet()) {
curContext.fill();
}
if (ensureStrokeSet()) {
curContext.stroke();
=======
//temporary workaround to not working fills for bezier -- will fix later
var xAv = 0, yAv = 0;
for(var i = 0; i < vertArray.length; i++){
xAv += vertArray[i][0];
yAv += vertArray[i][1];
}
xAv /= vertArray.length;
yAv /= vertArray.length;
var vert = [],
fillVertArray = [],
colorVertArray = [];
vert[0] = xAv;
vert[1] = yAv;
vert[2] = 0;
vert[3] = 0;
vert[4] = 0;
vert[5] = fillStyle[0];
vert[6] = fillStyle[1];
vert[7] = fillStyle[2];
vert[8] = fillStyle[3];
vert[9] = strokeStyle[0];
vert[10] = strokeStyle[1];
vert[11] = strokeStyle[2];
vert[12] = strokeStyle[3];
vert[13] = normalX;
vert[14] = normalY;
vert[15] = normalZ;
vertArray.unshift(vert);
for(var i = 0; i < vertArray.length; i++){
for(var j = 0; j < 3; j++){
fillVertArray.push(vertArray[i][j]);
}
for(var j = 5; j < 9; j++){
colorVertArray.push(vertArray[i][j]);
}
}
fill3D(fillVertArray, "TRIANGLE_FAN", colorVertArray);
}
>>>>>>>
//temporary workaround to not working fills for bezier -- will fix later
var xAv = 0, yAv = 0;
for(var i = 0; i < vertArray.length; i++){
xAv += vertArray[i][0];
yAv += vertArray[i][1];
}
xAv /= vertArray.length;
yAv /= vertArray.length;
var vert = [],
fillVertArray = [],
colorVertArray = [];
vert[0] = xAv;
vert[1] = yAv;
vert[2] = 0;
vert[3] = 0;
vert[4] = 0;
vert[5] = fillStyle[0];
vert[6] = fillStyle[1];
vert[7] = fillStyle[2];
vert[8] = fillStyle[3];
vert[9] = strokeStyle[0];
vert[10] = strokeStyle[1];
vert[11] = strokeStyle[2];
vert[12] = strokeStyle[3];
vert[13] = normalX;
vert[14] = normalY;
vert[15] = normalZ;
vertArray.unshift(vert);
for(var i = 0; i < vertArray.length; i++){
for(var j = 0; j < 3; j++){
fillVertArray.push(vertArray[i][j]);
}
for(var j = 5; j < 9; j++){
colorVertArray.push(vertArray[i][j]);
}
}
fill3D(fillVertArray, "TRIANGLE_FAN", colorVertArray);
}
<<<<<<<
return get$5(x, y, w, h, img);
=======
// PImage.get(x,y,w,h) was called, return x,y,w,h PImage of img
// changed for 0.9, offset start point needs to be *4
var start = y * img.width * 4 + (x*4);
var end = (y + h) * img.width * 4 + ((x + w) * 4);
c = new PImage(w, h, p.RGB);
for (var i = start, j = 0; i < end; i++, j++) {
// changed in 0.9
c.imageData.data[j] = img.imageData.data[i];
if ((j+1) % (w*4) === 0) {
//completed one line, increment i by offset
i += (img.width - w) * 4;
}
}
return c;
>>>>>>>
return get$5(x, y, w, h, img);
<<<<<<<
if (arguments.length === 3) {
=======
// PImage.set(x,y,c) was called, set coordinate x,y color to c of img
if (arguments.length === 4) {
var offset = y * img.width * 4 + (x*4);
img.imageData.data[offset] = (obj & p.RED_MASK) >>> 16;
img.imageData.data[offset+1] = (obj & p.GREEN_MASK) >>> 8;
img.imageData.data[offset+2] = (obj & p.BLUE_MASK);
img.imageData.data[offset+3] = (obj & p.ALPHA_MASK) >>> 24;
} else if (arguments.length === 3) {
>>>>>>>
if (arguments.length === 3) {
<<<<<<<
// If the font is a standard Canvas font...
if (!curTextFont.glyph) {
if (curContext.fillText || curContext.mozDrawText) {
ensureFillSet();
curContext.save();
curContext.font = curContext.mozTextStyle = curTextSize + "px " + curTextFont.name;
=======
var view = new PMatrix3D();
view.scale(1, -1, 1);
view.apply(modelView.array());
>>>>>>>
var view = new PMatrix3D();
view.scale(1, -1, 1);
view.apply(modelView.array()); |
<<<<<<<
/**
* This function takes content from a canvas and turns it into an ImageData object to be used with a PImage
*
* @returns {ImageData} ImageData object to attach to a PImage (1D array of pixel data)
*
* @see PImage
*/
Drawing2D.prototype.toImageData = function(x, y, w, h) {
x = x !== undef ? x : 0;
y = y !== undef ? y : 0;
w = w !== undef ? w : p.width;
h = h !== undef ? h : p.height;
return curContext.getImageData(x, y, w, h);
};
Drawing3D.prototype.toImageData = function(x, y, w, h) {
x = x !== undef ? x : 0;
y = y !== undef ? y : 0;
w = w !== undef ? w : p.width;
h = h !== undef ? h : p.height;
var c = document.createElement("canvas"),
ctx = c.getContext("2d"),
obj = ctx.createImageData(w, h),
uBuff = new Uint8Array(w * h * 4);
curContext.readPixels(x, y, w, h, curContext.RGBA, curContext.UNSIGNED_BYTE, uBuff);
for (var i=0, ul=uBuff.length, obj_data=obj.data; i < ul; i++) {
obj_data[i] = uBuff[(h - 1 - Math.floor(i / 4 / w)) * w * 4 + (i % (w * 4))];
}
return obj;
};
// Imports an external Processing.js library
p.Import = function(lib) {
// Replace evil-eval method with a DOM <script> tag insert method that
// binds new lib code to the Processing.lib names-space and the current
// p context. -F1LT3R
};
=======
>>>>>>>
/**
* This function takes content from a canvas and turns it into an ImageData object to be used with a PImage
*
* @returns {ImageData} ImageData object to attach to a PImage (1D array of pixel data)
*
* @see PImage
*/
Drawing2D.prototype.toImageData = function(x, y, w, h) {
x = x !== undef ? x : 0;
y = y !== undef ? y : 0;
w = w !== undef ? w : p.width;
h = h !== undef ? h : p.height;
return curContext.getImageData(x, y, w, h);
};
Drawing3D.prototype.toImageData = function(x, y, w, h) {
x = x !== undef ? x : 0;
y = y !== undef ? y : 0;
w = w !== undef ? w : p.width;
h = h !== undef ? h : p.height;
var c = document.createElement("canvas"),
ctx = c.getContext("2d"),
obj = ctx.createImageData(w, h),
uBuff = new Uint8Array(w * h * 4);
curContext.readPixels(x, y, w, h, curContext.RGBA, curContext.UNSIGNED_BYTE, uBuff);
for (var i=0, ul=uBuff.length, obj_data=obj.data; i < ul; i++) {
obj_data[i] = uBuff[(h - 1 - Math.floor(i / 4 / w)) * w * 4 + (i % (w * 4))];
}
return obj;
}; |
<<<<<<<
// Color modes
p.RGB = 1;
p.ARGB = 2;
p.HSB = 3;
p.ALPHA = 4;
p.CMYK = 5;
// Renderers
p.P2D = 1;
p.JAVA2D = 1;
p.WEBGL = 2;
p.P3D = 2;
p.OPENGL = 2;
p.EPSILON = 0.0001;
p.MAX_FLOAT = 3.4028235e+38;
p.MIN_FLOAT = -3.4028235e+38;
p.MAX_INT = 2147483647;
p.MIN_INT = -2147483648;
p.PI = Math.PI;
p.TWO_PI = 2 * p.PI;
p.HALF_PI = p.PI / 2;
p.THIRD_PI = p.PI / 3;
p.QUARTER_PI = p.PI / 4;
p.DEG_TO_RAD = p.PI / 180;
p.RAD_TO_DEG = 180 / p.PI;
p.WHITESPACE = " \t\n\r\f\u00A0";
// Filter/convert types
p.BLUR = 11;
p.GRAY = 12;
p.INVERT = 13;
p.OPAQUE = 14;
p.POSTERIZE = 15;
p.THRESHOLD = 16;
p.ERODE = 17;
p.DILATE = 18;
// Blend modes
p.REPLACE = 0;
p.BLEND = 1 << 0;
p.ADD = 1 << 1;
p.SUBTRACT = 1 << 2;
p.LIGHTEST = 1 << 3;
p.DARKEST = 1 << 4;
p.DIFFERENCE = 1 << 5;
p.EXCLUSION = 1 << 6;
p.MULTIPLY = 1 << 7;
p.SCREEN = 1 << 8;
p.OVERLAY = 1 << 9;
p.HARD_LIGHT = 1 << 10;
p.SOFT_LIGHT = 1 << 11;
p.DODGE = 1 << 12;
p.BURN = 1 << 13;
// Color component bit masks
p.ALPHA_MASK = 0xff000000;
p.RED_MASK = 0x00ff0000;
p.GREEN_MASK = 0x0000ff00;
p.BLUE_MASK = 0x000000ff;
// Projection matrices
p.CUSTOM = 0;
p.ORTHOGRAPHIC = 2;
p.PERSPECTIVE = 3;
// Shapes
p.POINT = 2;
p.POINTS = 2;
p.LINE = 4;
p.LINES = 4;
p.TRIANGLE = 8;
p.TRIANGLES = 9;
p.TRIANGLE_STRIP = 10;
p.TRIANGLE_FAN = 11;
p.QUAD = 16;
p.QUADS = 16;
p.QUAD_STRIP = 17;
p.POLYGON = 20;
p.PATH = 21;
p.RECT = 30;
p.ELLIPSE = 31;
p.ARC = 32;
p.SPHERE = 40;
p.BOX = 41;
// Shape closing modes
p.OPEN = 1;
p.CLOSE = 2;
// Shape drawing modes
p.CORNER = 0; // Draw mode convention to use (x, y) to (width, height)
p.CORNERS = 1; // Draw mode convention to use (x1, y1) to (x2, y2) coordinates
p.RADIUS = 2; // Draw mode from the center, and using the radius
p.CENTER_RADIUS = 2; // Deprecated! Use RADIUS instead
p.CENTER = 3; // Draw from the center, using second pair of values as the diameter
p.DIAMETER = 3; // Synonym for the CENTER constant. Draw from the center
p.CENTER_DIAMETER = 3; // Deprecated! Use DIAMETER instead
// Text vertical alignment modes
p.BASELINE = 0; // Default vertical alignment for text placement
p.TOP = 101; // Align text to the top
p.BOTTOM = 102; // Align text from the bottom, using the baseline
// UV Texture coordinate modes
p.NORMAL = 1;
p.NORMALIZED = 1;
p.IMAGE = 2;
// Text placement modes
p.MODEL = 4;
p.SHAPE = 5;
// Stroke modes
p.SQUARE = 'butt';
p.ROUND = 'round';
p.PROJECT = 'square';
p.MITER = 'miter';
p.BEVEL = 'bevel';
// Lighting modes
p.AMBIENT = 0;
p.DIRECTIONAL = 1;
//POINT = 2; Shared with Shape constant
p.SPOT = 3;
// Key constants
// Both key and keyCode will be equal to these values
p.BACKSPACE = 8;
p.TAB = 9;
p.ENTER = 10;
p.RETURN = 13;
p.ESC = 27;
p.DELETE = 127;
p.CODED = 0xffff;
// p.key will be CODED and p.keyCode will be this value
p.SHIFT = 16;
p.CONTROL = 17;
p.ALT = 18;
p.CAPSLK = 20;
p.PGUP = 33;
p.PGDN = 34;
p.END = 35;
p.HOME = 36;
p.LEFT = 37;
p.UP = 38;
p.RIGHT = 39;
p.DOWN = 40;
p.INS = 45;
p.DEL = 46;
p.F1 = 112;
p.F2 = 113;
p.F3 = 114;
p.F4 = 115;
p.F5 = 116;
p.F6 = 117;
p.F7 = 118;
p.F8 = 119;
p.F9 = 120;
p.F10 = 121;
p.F11 = 122;
p.F12 = 123;
p.NUMLK = 144;
var codedKeys = [p.SHIFT, p.CONTROL, p.ALT, p.CAPSLK, p.PGUP, p.PGDN, p.END, p.HOME, p.LEFT, p.UP, p.RIGHT, p.DOWN, p.NUMLK, p.INS,
p.F1, p.F2, p.F3, p.F4, p.F5, p.F6, p.F7, p.F8, p.F9, p.F10, p.F11, p.F12];
// Cursor types
p.ARROW = 'default';
p.CROSS = 'crosshair';
p.HAND = 'pointer';
p.MOVE = 'move';
p.TEXT = 'text';
p.WAIT = 'wait';
p.NOCURSOR = "url('data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='), auto";
// Hints
p.DISABLE_OPENGL_2X_SMOOTH = 1;
p.ENABLE_OPENGL_2X_SMOOTH = -1;
p.ENABLE_OPENGL_4X_SMOOTH = 2;
p.ENABLE_NATIVE_FONTS = 3;
p.DISABLE_DEPTH_TEST = 4;
p.ENABLE_DEPTH_TEST = -4;
p.ENABLE_DEPTH_SORT = 5;
p.DISABLE_DEPTH_SORT = -5;
p.DISABLE_OPENGL_ERROR_REPORT = 6;
p.ENABLE_OPENGL_ERROR_REPORT = -6;
p.ENABLE_ACCURATE_TEXTURES = 7;
p.DISABLE_ACCURATE_TEXTURES = -7;
p.HINT_COUNT = 10;
// PJS defined constants
p.SINCOS_LENGTH = parseInt(360 / 0.5, 10);
p.PRECISIONB = 15; // fixed point precision is limited to 15 bits!!
p.PRECISIONF = 1 << p.PRECISIONB;
p.PREC_MAXVAL = p.PRECISIONF - 1;
p.PREC_ALPHA_SHIFT = 24 - p.PRECISIONB;
p.PREC_RED_SHIFT = 16 - p.PRECISIONB;
p.NORMAL_MODE_AUTO = 0;
p.NORMAL_MODE_SHAPE = 1;
p.NORMAL_MODE_VERTEX = 2;
p.MAX_LIGHTS = 8;
p.focused = true;
=======
>>>>>>>
// Color modes
p.RGB = 1;
p.ARGB = 2;
p.HSB = 3;
p.ALPHA = 4;
p.CMYK = 5;
// Renderers
p.P2D = 1;
p.JAVA2D = 1;
p.WEBGL = 2;
p.P3D = 2;
p.OPENGL = 2;
p.EPSILON = 0.0001;
p.MAX_FLOAT = 3.4028235e+38;
p.MIN_FLOAT = -3.4028235e+38;
p.MAX_INT = 2147483647;
p.MIN_INT = -2147483648;
p.PI = Math.PI;
p.TWO_PI = 2 * p.PI;
p.HALF_PI = p.PI / 2;
p.THIRD_PI = p.PI / 3;
p.QUARTER_PI = p.PI / 4;
p.DEG_TO_RAD = p.PI / 180;
p.RAD_TO_DEG = 180 / p.PI;
p.WHITESPACE = " \t\n\r\f\u00A0";
// Filter/convert types
p.BLUR = 11;
p.GRAY = 12;
p.INVERT = 13;
p.OPAQUE = 14;
p.POSTERIZE = 15;
p.THRESHOLD = 16;
p.ERODE = 17;
p.DILATE = 18;
// Blend modes
p.REPLACE = 0;
p.BLEND = 1 << 0;
p.ADD = 1 << 1;
p.SUBTRACT = 1 << 2;
p.LIGHTEST = 1 << 3;
p.DARKEST = 1 << 4;
p.DIFFERENCE = 1 << 5;
p.EXCLUSION = 1 << 6;
p.MULTIPLY = 1 << 7;
p.SCREEN = 1 << 8;
p.OVERLAY = 1 << 9;
p.HARD_LIGHT = 1 << 10;
p.SOFT_LIGHT = 1 << 11;
p.DODGE = 1 << 12;
p.BURN = 1 << 13;
// Color component bit masks
p.ALPHA_MASK = 0xff000000;
p.RED_MASK = 0x00ff0000;
p.GREEN_MASK = 0x0000ff00;
p.BLUE_MASK = 0x000000ff;
// Projection matrices
p.CUSTOM = 0;
p.ORTHOGRAPHIC = 2;
p.PERSPECTIVE = 3;
// Shapes
p.POINT = 2;
p.POINTS = 2;
p.LINE = 4;
p.LINES = 4;
p.TRIANGLE = 8;
p.TRIANGLES = 9;
p.TRIANGLE_STRIP = 10;
p.TRIANGLE_FAN = 11;
p.QUAD = 16;
p.QUADS = 16;
p.QUAD_STRIP = 17;
p.POLYGON = 20;
p.PATH = 21;
p.RECT = 30;
p.ELLIPSE = 31;
p.ARC = 32;
p.SPHERE = 40;
p.BOX = 41;
// Shape closing modes
p.OPEN = 1;
p.CLOSE = 2;
// Shape drawing modes
p.CORNER = 0; // Draw mode convention to use (x, y) to (width, height)
p.CORNERS = 1; // Draw mode convention to use (x1, y1) to (x2, y2) coordinates
p.RADIUS = 2; // Draw mode from the center, and using the radius
p.CENTER_RADIUS = 2; // Deprecated! Use RADIUS instead
p.CENTER = 3; // Draw from the center, using second pair of values as the diameter
p.DIAMETER = 3; // Synonym for the CENTER constant. Draw from the center
p.CENTER_DIAMETER = 3; // Deprecated! Use DIAMETER instead
// Text vertical alignment modes
p.BASELINE = 0; // Default vertical alignment for text placement
p.TOP = 101; // Align text to the top
p.BOTTOM = 102; // Align text from the bottom, using the baseline
// UV Texture coordinate modes
p.NORMAL = 1;
p.NORMALIZED = 1;
p.IMAGE = 2;
// Text placement modes
p.MODEL = 4;
p.SHAPE = 5;
// Stroke modes
p.SQUARE = 'butt';
p.ROUND = 'round';
p.PROJECT = 'square';
p.MITER = 'miter';
p.BEVEL = 'bevel';
// Lighting modes
p.AMBIENT = 0;
p.DIRECTIONAL = 1;
//POINT = 2; Shared with Shape constant
p.SPOT = 3;
// Key constants
// Both key and keyCode will be equal to these values
p.BACKSPACE = 8;
p.TAB = 9;
p.ENTER = 10;
p.RETURN = 13;
p.ESC = 27;
p.DELETE = 127;
p.CODED = 0xffff;
// p.key will be CODED and p.keyCode will be this value
p.SHIFT = 16;
p.CONTROL = 17;
p.ALT = 18;
p.CAPSLK = 20;
p.PGUP = 33;
p.PGDN = 34;
p.END = 35;
p.HOME = 36;
p.LEFT = 37;
p.UP = 38;
p.RIGHT = 39;
p.DOWN = 40;
p.INS = 45;
p.DEL = 46;
p.F1 = 112;
p.F2 = 113;
p.F3 = 114;
p.F4 = 115;
p.F5 = 116;
p.F6 = 117;
p.F7 = 118;
p.F8 = 119;
p.F9 = 120;
p.F10 = 121;
p.F11 = 122;
p.F12 = 123;
p.NUMLK = 144;
var codedKeys = [p.SHIFT, p.CONTROL, p.ALT, p.CAPSLK, p.PGUP, p.PGDN, p.END, p.HOME, p.LEFT, p.UP, p.RIGHT, p.DOWN, p.NUMLK, p.INS,
p.F1, p.F2, p.F3, p.F4, p.F5, p.F6, p.F7, p.F8, p.F9, p.F10, p.F11, p.F12];
// Cursor types
p.ARROW = 'default';
p.CROSS = 'crosshair';
p.HAND = 'pointer';
p.MOVE = 'move';
p.TEXT = 'text';
p.WAIT = 'wait';
p.NOCURSOR = "url('data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='), auto";
// Hints
p.DISABLE_OPENGL_2X_SMOOTH = 1;
p.ENABLE_OPENGL_2X_SMOOTH = -1;
p.ENABLE_OPENGL_4X_SMOOTH = 2;
p.ENABLE_NATIVE_FONTS = 3;
p.DISABLE_DEPTH_TEST = 4;
p.ENABLE_DEPTH_TEST = -4;
p.ENABLE_DEPTH_SORT = 5;
p.DISABLE_DEPTH_SORT = -5;
p.DISABLE_OPENGL_ERROR_REPORT = 6;
p.ENABLE_OPENGL_ERROR_REPORT = -6;
p.ENABLE_ACCURATE_TEXTURES = 7;
p.DISABLE_ACCURATE_TEXTURES = -7;
p.HINT_COUNT = 10;
// PJS defined constants
p.SINCOS_LENGTH = parseInt(360 / 0.5, 10);
p.PRECISIONB = 15; // fixed point precision is limited to 15 bits!!
p.PRECISIONF = 1 << p.PRECISIONB;
p.PREC_MAXVAL = p.PRECISIONF - 1;
p.PREC_ALPHA_SHIFT = 24 - p.PRECISIONB;
p.PREC_RED_SHIFT = 16 - p.PRECISIONB;
p.NORMAL_MODE_AUTO = 0;
p.NORMAL_MODE_SHAPE = 1;
p.NORMAL_MODE_VERTEX = 2;
p.MAX_LIGHTS = 8;
p.focused = true;
<<<<<<<
"HALF_PI","HAND","HARD_LIGHT","HashMap","height","hex","hour","HSB","hue","image","IMAGE","imageMode",
"Import","int","intersect","INVERT","JAVA2D","join","key","keyCode","keyPressed","keyReleased","LEFT","lerp",
=======
"HALF_PI","HAND","HARD_LIGHT","HashMap","height","hex","hint","hour","HSB","hue","image","IMAGE","imageMode",
"Import","int","intersect","INVERT","JAVA2D","join","key","keyPressed","keyReleased","LEFT","lerp",
>>>>>>>
"HALF_PI","HAND","HARD_LIGHT","HashMap","height","hex","hint","hour","HSB","hue","image","IMAGE","imageMode",
"Import","int","intersect","INVERT","JAVA2D","join","key","keyCode","keyPressed","keyReleased","LEFT","lerp", |
<<<<<<<
* Shears a shape around the x-axis the amount specified by the angle parameter.
* Angles should be specified in radians (values from 0 to PI*2) or converted to radians
* with the radians() function. Objects are always sheared around their relative position
* to the origin and positive numbers shear objects in a clockwise direction. Transformations
* apply to everything that happens after and subsequent calls to the function accumulates the
* effect. For example, calling shearX(PI/2) and then shearX(PI/2) is the same as shearX(PI)
*
* @param {int|float} angleInRadians angle of rotation specified in radians
*
* @returns none
*
* @see rotateX
* @see rotateY
* @see rotateZ
* @see rotate
* @see translate
* @see scale
* @see popMatrix
* @see pushMatrix
*/
Drawing3D.prototype.shearX = function(angleInRadians) {
modelView.shearX(angleInRadians);
};
/**
* Shears a shape around the y-axis the amount specified by the angle parameter.
* Angles should be specified in radians (values from 0 to PI*2) or converted to
* radians with the radians() function. Objects are always sheared around their
* relative position to the origin and positive numbers shear objects in a
* clockwise direction. Transformations apply to everything that happens after
* and subsequent calls to the function accumulates the effect. For example,
* calling shearY(PI/2) and then shearY(PI/2) is the same as shearY(PI).
*
* @param {int|float} angleInRadians angle of rotation specified in radians
*
* @returns none
*
* @see rotateX
* @see rotateY
* @see rotateZ
* @see rotate
* @see translate
* @see scale
* @see popMatrix
* @see pushMatrix
* @see shearX
*/
Drawing3D.prototype.shearY = function(angleInRadians) {
modelView.shearY(angleInRadians);
};
/**
=======
* Shears a shape around the x-axis the amount specified by the angle parameter.
* Angles should be specified in radians (values from 0 to PI*2) or converted to radians
* with the radians() function. Objects are always sheared around their relative position
* to the origin and positive numbers shear objects in a clockwise direction. Transformations
* apply to everything that happens after and subsequent calls to the function accumulates the
* effect. For example, calling shearX(PI/2) and then shearX(PI/2) is the same as shearX(PI)
*
* @param {int|float} angleInRadians angle of rotation specified in radians
*
* @returns none
*
* @see rotateX
* @see rotateY
* @see rotateZ
* @see rotate
* @see translate
* @see scale
* @see popMatrix
* @see pushMatrix
*/
Drawing2D.prototype.shearX = function(angleInRadians) {
modelView.shearX(angleInRadians);
curContext.transform(1,0,angleInRadians,1,0,0);
};
Drawing3D.prototype.shearX = function(angleInRadians) {
throw("Processing.js: shearX(angleInRadians) is not supported in 3D mode");
};
/**
* Shears a shape around the y-axis the amount specified by the angle parameter.
* Angles should be specified in radians (values from 0 to PI*2) or converted to
* radians with the radians() function. Objects are always sheared around their
* relative position to the origin and positive numbers shear objects in a
* clockwise direction. Transformations apply to everything that happens after
* and subsequent calls to the function accumulates the effect. For example,
* calling shearY(PI/2) and then shearY(PI/2) is the same as shearY(PI).
*
* @param {int|float} angleInRadians angle of rotation specified in radians
*
* @returns none
*
* @see rotateX
* @see rotateY
* @see rotateZ
* @see rotate
* @see translate
* @see scale
* @see popMatrix
* @see pushMatrix
* @see shearX
*/
Drawing2D.prototype.shearY = function(angleInRadians) {
modelView.shearY(angleInRadians);
curContext.transform(1,angleInRadians,0,1,0,0);
};
Drawing3D.prototype.shearY = function(angleInRadians) {
throw("Processing.js: shearY(angleInRadians) is not supported in 3D mode");
};
/**
>>>>>>>
* Shears a shape around the x-axis the amount specified by the angle parameter.
* Angles should be specified in radians (values from 0 to PI*2) or converted to radians
* with the radians() function. Objects are always sheared around their relative position
* to the origin and positive numbers shear objects in a clockwise direction. Transformations
* apply to everything that happens after and subsequent calls to the function accumulates the
* effect. For example, calling shearX(PI/2) and then shearX(PI/2) is the same as shearX(PI)
*
* @param {int|float} angleInRadians angle of rotation specified in radians
*
* @returns none
*
* @see rotateX
* @see rotateY
* @see rotateZ
* @see rotate
* @see translate
* @see scale
* @see popMatrix
* @see pushMatrix
*/
Drawing2D.prototype.shearX = function(angleInRadians) {
modelView.shearX(angleInRadians);
curContext.transform(1,0,angleInRadians,1,0,0);
};
Drawing3D.prototype.shearX = function(angleInRadians) {
modelView.shearX(angleInRadians);
};
/**
* Shears a shape around the y-axis the amount specified by the angle parameter.
* Angles should be specified in radians (values from 0 to PI*2) or converted to
* radians with the radians() function. Objects are always sheared around their
* relative position to the origin and positive numbers shear objects in a
* clockwise direction. Transformations apply to everything that happens after
* and subsequent calls to the function accumulates the effect. For example,
* calling shearY(PI/2) and then shearY(PI/2) is the same as shearY(PI).
*
* @param {int|float} angleInRadians angle of rotation specified in radians
*
* @returns none
*
* @see rotateX
* @see rotateY
* @see rotateZ
* @see rotate
* @see translate
* @see scale
* @see popMatrix
* @see pushMatrix
* @see shearX
*/
Drawing2D.prototype.shearY = function(angleInRadians) {
modelView.shearY(angleInRadians);
curContext.transform(1,angleInRadians,0,1,0,0);
};
Drawing3D.prototype.shearY = function(angleInRadians) {
modelView.shearY(angleInRadians);
};
/** |
<<<<<<<
=======
// horizontal offset/alignment
if(align === p.RIGHT || align === p.CENTER) {
if (curContext.fillText) {
textWidth = curContext.measureText( str ).width;
} else if (curContext.mozDrawText) {
textWidth = curContext.mozMeasureText( str );
}
if(align === p.RIGHT) {
xOffset = -textWidth;
} else { // if(align === p.CENTER)
xOffset = -textWidth/2;
}
}
>>>>>>>
// horizontal offset/alignment
if(align === p.RIGHT || align === p.CENTER) {
if (curContext.fillText) {
textWidth = curContext.measureText( str ).width;
} else if (curContext.mozDrawText) {
textWidth = curContext.mozMeasureText( str );
}
if(align === p.RIGHT) {
xOffset = -textWidth;
} else { // if(align === p.CENTER)
xOffset = -textWidth/2;
}
}
<<<<<<<
if(command.offset + curTextSize > height + baselineOffset * curTextSize) {
=======
if(command.offset + boxYOffset2 < 0) {
continue; // skip if not inside box yet
}
if(command.offset + boxYOffset2 + curTextSize > height) {
>>>>>>>
if(command.offset + boxYOffset2 < 0) {
continue; // skip if not inside box yet
}
if(command.offset + boxYOffset2 + curTextSize > height) {
<<<<<<<
"blend","BLEND","blendColor","blue","BLUE_MASK","BLUR","boolean","box","brightness","BURN","byte","camera","ceil",
"CENTER","CENTER_RADIUS","char","Character","clear","CLOSE","CMYK","CODED","color","colorMode","concat",
=======
"blend","BLEND","blendColor","blue","BLUE_MASK","BLUR","boolean", "BOTTOM",
"box","brightness","BURN","byte","camera","ceil",
"CENTER","CENTER_RADIUS","char","clear","CLOSE","CMYK","CODED","color","colorMode","concat",
>>>>>>>
"blend","BLEND","blendColor","blue","BLUE_MASK","BLUR","boolean", "BOTTOM", "box","brightness","BURN","byte","camera","ceil",
"CENTER","CENTER_RADIUS","char","Character","clear","CLOSE","CMYK","CODED","color","colorMode","concat", |
<<<<<<<
getUniformLocation: __empty_func__,
uniform1f: __empty_func__,
uniform2f: __empty_func__,
uniform3f: __empty_func__,
uniform4f: __empty_func__,
uniformfv: __empty_func__,
uniform2fv: __empty_func__,
uniform3fv: __empty_func__,
uniform1i: __empty_func__,
uniform2i: __empty_func__,
uniform3i: __empty_func__,
uniform4i: __empty_func__,
getImageData: function() { return {width:1, height: 1, data:[1,2,3,4]}; }
=======
getImageData: function() { return {width:1, height: 1, data:[1,2,3,4]}; },
createImageData: function() { return {width:1, height: 1, data:[1,2,3,4]}; },
drawImage: __empty_func__,
putImageData: __empty_func__
>>>>>>>
getUniformLocation: __empty_func__,
uniform1f: __empty_func__,
uniform2f: __empty_func__,
uniform3f: __empty_func__,
uniform4f: __empty_func__,
uniformfv: __empty_func__,
uniform2fv: __empty_func__,
uniform3fv: __empty_func__,
uniform1i: __empty_func__,
uniform2i: __empty_func__,
uniform3i: __empty_func__,
uniform4i: __empty_func__,
getImageData: function() { return {width:1, height: 1, data:[1,2,3,4]}; },
createImageData: function() { return {width:1, height: 1, data:[1,2,3,4]}; },
drawImage: __empty_func__,
putImageData: __empty_func__ |
<<<<<<<
vertexAttribPointer( programObject , "Vertex", 3 , boxOutlineBuffer );
if( doFill === true ) {
// fix stitching problems. (lines get occluded by triangles
// since they share the same depth values). This is not entirely
// working, but it's a start for drawing the outline. So
// developers can start playing around with styles.
curContext.enable( curContext.POLYGON_OFFSET_FILL );
curContext.polygonOffset( 1, 1 );
var c = curContext.fillStyle.slice( 5, -1 ).split( "," );
uniformf(programObject, "color", [ c[0]/255, c[1]/255, c[2]/255, c[3] ] );
vertexAttribPointer( programObject, "Vertex", 3 , boxBuffer );
curContext.drawArrays( curContext.TRIANGLES, 0 , boxVerts.length/3 );
curContext.disable( curContext.POLYGON_OFFSET_FILL );
}
// If you're working with styles, you'll need to change this literal.
curContext.lineWidth( 1 );
uniformf( programObject, "color", [0,0,0,1] );
curContext.drawArrays( curContext.LINES, 0 , boxOutlineVerts.length/3 );
}
};
// sphere and sphereDetail
// Taken and revised from:
// git://github.com/omouse/ohprocessing.git/core/src/processing/core/PGraphics.java
// UNDER :License: LGPL Java
p.sphereDetail = function sphereDetail(ures, vres) {
if(arguments.length === 1) {
ures = vres = arguments[0];
}
=======
if( lineWidth > 0 && doStroke ) {
// eventually need to make this more efficient.
var c = strokeStyle.slice( 5, -1 ).split( "," );
uniformf(programObject, "color", [ c[0]/255, c[1]/255, c[2]/255, c[3] ] );
curContext.lineWidth( lineWidth );
vertexAttribPointer( programObject , "Vertex", 3 , boxOutlineBuffer );
curContext.drawArrays( curContext.LINES, 0 , boxOutlineVerts.length/3 );
}
>>>>>>>
if( doFill === true ) {
// fix stitching problems. (lines get occluded by triangles
// since they share the same depth values). This is not entirely
// working, but it's a start for drawing the outline. So
// developers can start playing around with styles.
curContext.enable( curContext.POLYGON_OFFSET_FILL );
curContext.polygonOffset( 1, 1 );
var c = curContext.fillStyle.slice( 5, -1 ).split( "," );
uniformf(programObject, "color", [ c[0]/255, c[1]/255, c[2]/255, c[3] ] );
vertexAttribPointer( programObject, "Vertex", 3 , boxBuffer );
curContext.drawArrays( curContext.TRIANGLES, 0 , boxVerts.length/3 );
curContext.disable( curContext.POLYGON_OFFSET_FILL );
}
if( lineWidth > 0 && doStroke ) {
// eventually need to make this more efficient.
var c = strokeStyle.slice( 5, -1 ).split( "," );
uniformf(programObject, "color", [ c[0]/255, c[1]/255, c[2]/255, c[3] ] );
curContext.lineWidth( lineWidth );
vertexAttribPointer( programObject , "Vertex", 3 , boxOutlineBuffer );
curContext.drawArrays( curContext.LINES, 0 , boxOutlineVerts.length/3 );
}
}
};
// sphere and sphereDetail
// Taken and revised from:
// git://github.com/omouse/ohprocessing.git/core/src/processing/core/PGraphics.java
// UNDER :License: LGPL Java
p.sphereDetail = function sphereDetail(ures, vres) {
if(arguments.length === 1) {
ures = vres = arguments[0];
} |
<<<<<<<
parsePath: function(){
this.family = PConstants.PATH;
=======
parsePath: function() {
this.family = p.PATH;
>>>>>>>
parsePath: function() {
this.family = PConstants.PATH;
<<<<<<<
this.parsePathCode(PConstants.BEZIER_VERTEX);
// x1/y1 already covered by last moveto, lineto, or curveto
this.parsePathVertex(x1 + ((cx-x1)*2/3), y1 + ((cy-y1)*2/3));
this.parsePathVertex(x2 + ((cx-x2)*2/3), y2 + ((cy-y2)*2/3));
this.parsePathVertex(x2, y2);
=======
if (this.vertices.length > 0) {
this.parsePathCode(p.BEZIER_VERTEX);
// x1/y1 already covered by last moveto, lineto, or curveto
this.parsePathVertex(x1 + ((cx-x1)*2/3), y1 + ((cy-y1)*2/3));
this.parsePathVertex(x2 + ((cx-x2)*2/3), y2 + ((cy-y2)*2/3));
this.parsePathVertex(x2, y2);
} else {
throw ("Path must start with M/m");
}
>>>>>>>
if (this.vertices.length > 0) {
this.parsePathCode(PConstants.BEZIER_VERTEX);
// x1/y1 already covered by last moveto, lineto, or curveto
this.parsePathVertex(x1 + ((cx-x1)*2/3), y1 + ((cy-y1)*2/3));
this.parsePathVertex(x2 + ((cx-x2)*2/3), y2 + ((cy-y2)*2/3));
this.parsePathVertex(x2, y2);
} else {
throw ("Path must start with M/m");
}
<<<<<<<
this.parsePathCode(PConstants.BEZIER_VERTEX );
this.parsePathVertex(x1, y1);
this.parsePathVertex(x2, y2);
this.parsePathVertex(x3, y3);
=======
if (this.vertices.length > 0) {
this.parsePathCode(p.BEZIER_VERTEX );
this.parsePathVertex(x1, y1);
this.parsePathVertex(x2, y2);
this.parsePathVertex(x3, y3);
} else {
throw ("Path must start with M/m");
}
>>>>>>>
if (this.vertices.length > 0) {
this.parsePathCode(PConstants.BEZIER_VERTEX );
this.parsePathVertex(x1, y1);
this.parsePathVertex(x2, y2);
this.parsePathVertex(x3, y3);
} else {
throw ("Path must start with M/m");
}
<<<<<<<
this.parsePathCode(PConstants.VERTEX);
this.parsePathVertex(px, py);
// add property to distinguish between curContext.moveTo or curContext.lineTo
this.vertices[this.vertices.length-1]["moveTo"] = false;
=======
if (this.vertices.length > 0) {
this.parsePathCode(p.VERTEX);
this.parsePathVertex(px, py);
// add property to distinguish between curContext.moveTo or curContext.lineTo
this.vertices[this.vertices.length-1]["moveTo"] = false;
} else {
throw ("Path must start with M/m");
}
>>>>>>>
if (this.vertices.length > 0) {
this.parsePathCode(PConstants.VERTEX);
this.parsePathVertex(px, py);
// add property to distinguish between curContext.moveTo or curContext.lineTo
this.vertices[this.vertices.length-1]["moveTo"] = false;
} else {
throw ("Path must start with M/m");
}
<<<<<<<
if (closeShape) {
=======
if(!close){
//p.CLOSE = false;
}
else{
//p.CLOSE = true;
>>>>>>>
if (closeShape) {
<<<<<<<
if (isCurve && curShape === PConstants.POLYGON || isCurve && curShape === undef) {
if (p.use3DContext) {
=======
if(isCurve && curShape === p.POLYGON || isCurve && curShape === undef){
if(p.use3DContext){
>>>>>>>
if (isCurve && curShape === PConstants.POLYGON || isCurve && curShape === undef) {
if (p.use3DContext) { |
<<<<<<<
p.mouseOver = undef;
p.mouseOut = undef;
=======
p.touchStart = undef;
p.touchEnd = undef;
p.touchMove = undef;
p.touchCancel = undef;
>>>>>>>
p.mouseOver = undef;
p.mouseOut = undef;
p.touchStart = undef;
p.touchEnd = undef;
p.touchMove = undef;
p.touchCancel = undef;
<<<<<<<
var names = [ /* this code is generated by jsglobals.js */
"abs", "acos", "alpha", "ambient", "ambientLight", "append", "applyMatrix",
"arc", "arrayCopy", "asin", "atan", "atan2", "background", "beginCamera",
"beginDraw", "beginShape", "bezier", "bezierDetail", "bezierPoint",
"bezierTangent", "bezierVertex", "binary", "blend", "blendColor",
"blit_resize", "blue", "boolean", "box", "breakShape", "brightness",
"byte", "camera", "ceil", "char", "Character", "clear", "color",
"colorMode", "concat", "console", "constrain", "copy", "cos", "createFont",
"createGraphics", "createImage", "cursor", "curve", "curveDetail",
"curvePoint", "curveTangent", "curveTightness", "curveVertex", "day",
"defaultColor", "degrees", "directionalLight", "disableContextMenu",
"dist", "draw", "ellipse", "ellipseMode", "emissive", "enableContextMenu",
"endCamera", "endDraw", "endShape", "exit", "exp", "expand", "externals",
"fill", "filter", "filter_bilinear", "filter_new_scanline", "float",
"floor", "focused", "frameCount", "frameRate", "frustum", "get",
"glyphLook", "glyphTable", "green", "height", "hex", "hint", "hour", "hue",
"image", "imageMode", "Import", "int", "intersect", "join", "key",
"keyCode", "keyPressed", "keyReleased", "keyTyped", "lerp", "lerpColor",
"lightFalloff", "lights", "lightSpecular", "line", "link", "loadBytes",
"loadFont", "loadGlyphs", "loadImage", "loadPixels", "loadShape",
"loadStrings", "log", "loop", "mag", "map", "match", "matchAll", "max",
"millis", "min", "minute", "mix", "modelX", "modelY", "modelZ", "modes",
"month", "mouseButton", "mouseClicked", "mouseDragged", "mouseMoved",
"mouseOut", "mouseOver", "mousePressed", "mouseReleased", "mouseScroll",
"mouseScrolled", "mouseX", "mouseY", "name", "nf", "nfc", "nfp", "nfs",
"noCursor", "noFill", "noise", "noiseDetail", "noiseSeed", "noLights",
"noLoop", "norm", "normal", "noSmooth", "noStroke", "noTint", "ortho",
"parseBoolean", "peg", "perspective", "PFont", "PImage", "pixels",
"PMatrix2D", "PMatrix3D", "PMatrixStack", "pmouseX", "pmouseY", "point",
"pointLight", "popMatrix", "popStyle", "pow", "print", "printCamera",
"println", "printMatrix", "printProjection", "PShape", "PShapeSVG",
"pushMatrix", "pushStyle", "quad", "radians", "random", "Random",
"randomSeed", "rect", "rectMode", "red", "redraw", "requestImage",
"resetMatrix", "reverse", "rotate", "rotateX", "rotateY", "rotateZ",
"round", "saturation", "save", "saveFrame", "saveStrings", "scale",
"screenX", "screenY", "screenZ", "second", "set", "setup", "shape",
"shapeMode", "shared", "shininess", "shorten", "sin", "size", "smooth",
"sort", "specular", "sphere", "sphereDetail", "splice", "split",
"splitTokens", "spotLight", "sq", "sqrt", "status", "str", "stroke",
"strokeCap", "strokeJoin", "strokeWeight", "subset", "tan", "text",
"textAlign", "textAscent", "textDescent", "textFont", "textLeading",
"textMode", "textSize", "texture", "textureMode", "textWidth", "tint",
"translate", "triangle", "trim", "unbinary", "unhex", "updatePixels",
"use3DContext", "vertex", "width", "XMLElement", "year", "__equals",
"__frameRate", "__hashCode", "__int_cast", "__keyPressed",
"__mousePressed", "__printStackTrace", "__replace", "__replaceAll",
"__replaceFirst", "__toCharArray"];
=======
var names = [ /* this code is generated by jsglobals.js */
"abs", "acos", "alpha", "ambient", "ambientLight", "append", "applyMatrix",
"arc", "arrayCopy", "asin", "atan", "atan2", "background", "beginCamera",
"beginDraw", "beginShape", "bezier", "bezierDetail", "bezierPoint",
"bezierTangent", "bezierVertex", "binary", "blend", "blendColor",
"blit_resize", "blue", "boolean", "box", "breakShape", "brightness",
"byte", "camera", "ceil", "char", "Character", "clear", "color",
"colorMode", "concat", "console", "constrain", "copy", "cos", "createFont",
"createGraphics", "createImage", "cursor", "curve", "curveDetail",
"curvePoint", "curveTangent", "curveTightness", "curveVertex", "day",
"defaultColor", "degrees", "directionalLight", "disableContextMenu",
"dist", "draw", "ellipse", "ellipseMode", "emissive", "enableContextMenu",
"endCamera", "endDraw", "endShape", "exit", "exp", "expand", "externals",
"fill", "filter", "filter_bilinear", "filter_new_scanline", "float",
"floor", "focused", "frameCount", "frameRate", "frustum", "get",
"glyphLook", "glyphTable", "green", "height", "hex", "hint", "hour", "hue",
"image", "imageMode", "Import", "int", "intersect", "join", "key",
"keyCode", "keyPressed", "keyReleased", "keyTyped", "lerp", "lerpColor",
"lightFalloff", "lights", "lightSpecular", "line", "link", "loadBytes",
"loadFont", "loadGlyphs", "loadImage", "loadPixels", "loadShape",
"loadStrings", "log", "loop", "mag", "map", "match", "matchAll", "max",
"millis", "min", "minute", "mix", "modelX", "modelY", "modelZ", "modes",
"month", "mouseButton", "mouseClicked", "mouseDragged", "mouseMoved",
"mousePressed", "mouseReleased", "mouseScroll", "mouseScrolled", "mouseX",
"mouseY", "name", "nf", "nfc", "nfp", "nfs", "noCursor", "noFill", "noise",
"noiseDetail", "noiseSeed", "noLights", "noLoop", "norm", "normal",
"noSmooth", "noStroke", "noTint", "ortho", "peg", "perspective", "PFont",
"PImage", "pixels", "PMatrix2D", "PMatrix3D", "PMatrixStack", "pmouseX",
"pmouseY", "point", "pointLight", "popMatrix", "popStyle", "pow", "print",
"printCamera", "println", "printMatrix", "printProjection", "PShape",
"PShapeSVG", "pushMatrix", "pushStyle", "quad", "radians", "random",
"Random", "randomSeed", "rect", "rectMode", "red", "redraw",
"requestImage", "resetMatrix", "reverse", "rotate", "rotateX", "rotateY",
"rotateZ", "round", "saturation", "save", "saveFrame", "saveStrings",
"scale", "screenX", "screenY", "screenZ", "second", "set", "setup",
"shape", "shapeMode", "shared", "shininess", "shorten", "sin", "size",
"smooth", "sort", "specular", "sphere", "sphereDetail", "splice", "split",
"splitTokens", "spotLight", "sq", "sqrt", "status", "str", "stroke",
"strokeCap", "strokeJoin", "strokeWeight", "subset", "tan", "text",
"textAlign", "textAscent", "textDescent", "textFont", "textLeading",
"textMode", "textSize", "texture", "textureMode", "textWidth", "tint",
"touchCancel", "touchEnd", "touchMove", "touchStart", "translate",
"triangle", "trim", "unbinary", "unhex", "updatePixels", "use3DContext",
"vertex", "width", "XMLElement", "year", "__frameRate", "__int_cast",
"__keyPressed", "__mousePressed"];
>>>>>>>
var names = [ /* this code is generated by jsglobals.js */
"abs", "acos", "alpha", "ambient", "ambientLight", "append", "applyMatrix",
"arc", "arrayCopy", "asin", "atan", "atan2", "background", "beginCamera",
"beginDraw", "beginShape", "bezier", "bezierDetail", "bezierPoint",
"bezierTangent", "bezierVertex", "binary", "blend", "blendColor",
"blit_resize", "blue", "boolean", "box", "breakShape", "brightness",
"byte", "camera", "ceil", "char", "Character", "clear", "color",
"colorMode", "concat", "console", "constrain", "copy", "cos", "createFont",
"createGraphics", "createImage", "cursor", "curve", "curveDetail",
"curvePoint", "curveTangent", "curveTightness", "curveVertex", "day",
"defaultColor", "degrees", "directionalLight", "disableContextMenu",
"dist", "draw", "ellipse", "ellipseMode", "emissive", "enableContextMenu",
"endCamera", "endDraw", "endShape", "exit", "exp", "expand", "externals",
"fill", "filter", "filter_bilinear", "filter_new_scanline", "float",
"floor", "focused", "frameCount", "frameRate", "frustum", "get",
"glyphLook", "glyphTable", "green", "height", "hex", "hint", "hour", "hue",
"image", "imageMode", "Import", "int", "intersect", "join", "key",
"keyCode", "keyPressed", "keyReleased", "keyTyped", "lerp", "lerpColor",
"lightFalloff", "lights", "lightSpecular", "line", "link", "loadBytes",
"loadFont", "loadGlyphs", "loadImage", "loadPixels", "loadShape",
"loadStrings", "log", "loop", "mag", "map", "match", "matchAll", "max",
"millis", "min", "minute", "mix", "modelX", "modelY", "modelZ", "modes",
"month", "mouseButton", "mouseClicked", "mouseDragged", "mouseMoved",
"mouseOut", "mouseOver", "mousePressed", "mouseReleased", "mouseScroll",
"mouseScrolled", "mouseX", "mouseY", "name", "nf", "nfc", "nfp", "nfs",
"noCursor", "noFill", "noise", "noiseDetail", "noiseSeed", "noLights",
"noLoop", "norm", "normal", "noSmooth", "noStroke", "noTint", "ortho",
"parseBoolean", "peg", "perspective", "PFont", "PImage", "pixels",
"PMatrix2D", "PMatrix3D", "PMatrixStack", "pmouseX", "pmouseY", "point",
"pointLight", "popMatrix", "popStyle", "pow", "print", "printCamera",
"println", "printMatrix", "printProjection", "PShape", "PShapeSVG",
"pushMatrix", "pushStyle", "quad", "radians", "random", "Random",
"randomSeed", "rect", "rectMode", "red", "redraw", "requestImage",
"resetMatrix", "reverse", "rotate", "rotateX", "rotateY", "rotateZ",
"round", "saturation", "save", "saveFrame", "saveStrings", "scale",
"screenX", "screenY", "screenZ", "second", "set", "setup", "shape",
"shapeMode", "shared", "shininess", "shorten", "sin", "size", "smooth",
"sort", "specular", "sphere", "sphereDetail", "splice", "split",
"splitTokens", "spotLight", "sq", "sqrt", "status", "str", "stroke",
"strokeCap", "strokeJoin", "strokeWeight", "subset", "tan", "text",
"textAlign", "textAscent", "textDescent", "textFont", "textLeading",
"textMode", "textSize", "texture", "textureMode", "textWidth", "tint",
"touchCancel", "touchEnd", "touchMove", "touchStart", "translate",
"triangle", "trim", "unbinary", "unhex", "updatePixels", "use3DContext",
"vertex", "width", "XMLElement", "year", "__equals", "__frameRate",
"__hashCode", "__int_cast", "__keyPressed", "__mousePressed",
"__printStackTrace", "__replace", "__replaceAll", "__replaceFirst",
"__toCharArray"]; |
<<<<<<<
{ path: "text-defaults.pde", tags: ["2D", "Text"], epsilonOverride: 0.10 }, /* See ticket #1172 */
{ path: "text-ascent-descent.pde", tags: ["2D", "Text"], epsilonOverride: 0.09 }, /* See ticket #1172 */
{ path: "text-align.pde", tags: ["2D", "Text"], epsilonOverride: 0.14 }, /* See ticket #1172 */
{ path: "text-width_comic.pde", tags:["2D", "Text"], epsilonOverride: 0.35 }, /* See ticket #1172 */
{ path: "text-leading.pde", tags: ["2D", "Text"], epsilonOverride: 0.20 }, /* See ticket #1172 */
{ path: "letters.pde", tags: ["2D", "Text"], epsilonOverride: 0.45 }, /* See ticket #1172 */
{ path: "words.pde", tags: ["2D", "Text"], epsilonOverride: 0.25 }, /* See ticket #1172 */
=======
{ path: "string-codepointat.pde", tags: ["2D", "Text"], epsilonOverride: 0.20 },
{ path: "text-align.pde", tags: ["2D"], epsilonOverride: 0.14 },
{ path: "words.pde", tags: ["2D"], epsilonOverride: 0.25 }, /* See ticket #1172 */
{ path: "defaults-text.pde", tags: ["2D"], epsilonOverride: 0.10 }, /* See ticket #1172 */
>>>>>>>
{ path: "string-codepointat.pde", tags: ["2D", "Text"], epsilonOverride: 0.20 },
{ path: "text-defaults.pde", tags: ["2D", "Text"], epsilonOverride: 0.10 }, /* See ticket #1172 */
{ path: "text-ascent-descent.pde", tags: ["2D", "Text"], epsilonOverride: 0.09 }, /* See ticket #1172 */
{ path: "text-align.pde", tags: ["2D", "Text"], epsilonOverride: 0.14 }, /* See ticket #1172 */
{ path: "text-width_comic.pde", tags:["2D", "Text"], epsilonOverride: 0.35 }, /* See ticket #1172 */
{ path: "text-leading.pde", tags: ["2D", "Text"], epsilonOverride: 0.20 }, /* See ticket #1172 */
{ path: "letters.pde", tags: ["2D", "Text"], epsilonOverride: 0.45 }, /* See ticket #1172 */
{ path: "words.pde", tags: ["2D", "Text"], epsilonOverride: 0.25 }, /* See ticket #1172 */ |
<<<<<<<
if (size) {
curTextSize = size;
curTextLeading = (p.textAscent() + p.textDescent()) * 1.275;
}
=======
curTextSize = size;
curContext.font = curContext.mozTextStyle = curTextSize + "px " + curTextFont.name;
>>>>>>>
if (size) {
curTextSize = size;
curContext.font = curContext.mozTextStyle = curTextSize + "px " + curTextFont.name;
} |
<<<<<<<
{ path: "blend-subtract.pde", tags: ["2D","BLEND"], epsilonOverride: 0.09 },
{ path: "loadShape.pde", tags: ["2D","SVG"], epsilonOverride: 0.06 },
{ path: "loadShape2.pde", tags: ["2D","SVG"], epsilonOverride: 0.08 },
=======
{ path: "blend-subtract.pde", tags: ["2D","BLEND"], epsilonOverride: 0.10 },
{ path: "loadShape.pde", tags: ["2D","SVG"] },
{ path: "loadShape2.pde", tags: ["2D","SVG"] },
>>>>>>>
{ path: "blend-subtract.pde", tags: ["2D","BLEND"], epsilonOverride: 0.10 },
{ path: "loadShape.pde", tags: ["2D","SVG"], epsilonOverride: 0.06 },
{ path: "loadShape2.pde", tags: ["2D","SVG"], epsilonOverride: 0.08 }, |
<<<<<<<
// Unsupported Processing File and I/O operations.
(function(Processing) {
var unsupportedP5 = ("open() createOutput() createInput() BufferedReader selectFolder() " +
"dataPath() createWriter() selectOutput() beginRecord() " +
"saveStream() endRecord() selectInput() saveBytes() createReader() " +
"beginRaw() endRaw() PrintWriter").split(" "),
count = unsupportedP5.length,
prettyName,
p5Name;
function createUnsupportedFunc(n) {
return function() {
throw "Processing.js does not support " + n + ".";
};
}
while (count--) {
prettyName = unsupportedP5[count];
p5Name = prettyName.replace("()", "");
Processing[p5Name] = createUnsupportedFunc(prettyName);
}
}(defaultScope));
=======
// screenWidth and screenHeight are shared by all instances.
// and return the width/height of the browser's viewport.
defaultScope.defineProperty(defaultScope, 'screenWidth',
{ get: function() { return window.innerWidth; } });
defaultScope.defineProperty(defaultScope, 'screenHeight',
{ get: function() { return window.innerHeight; } });
>>>>>>>
// Unsupported Processing File and I/O operations.
(function(Processing) {
var unsupportedP5 = ("open() createOutput() createInput() BufferedReader selectFolder() " +
"dataPath() createWriter() selectOutput() beginRecord() " +
"saveStream() endRecord() selectInput() saveBytes() createReader() " +
"beginRaw() endRaw() PrintWriter").split(" "),
count = unsupportedP5.length,
prettyName,
p5Name;
function createUnsupportedFunc(n) {
return function() {
throw "Processing.js does not support " + n + ".";
};
}
while (count--) {
prettyName = unsupportedP5[count];
p5Name = prettyName.replace("()", "");
Processing[p5Name] = createUnsupportedFunc(prettyName);
}
}(defaultScope));
// screenWidth and screenHeight are shared by all instances.
// and return the width/height of the browser's viewport.
defaultScope.defineProperty(defaultScope, 'screenWidth',
{ get: function() { return window.innerWidth; } });
defaultScope.defineProperty(defaultScope, 'screenHeight',
{ get: function() { return window.innerHeight; } }); |
<<<<<<<
}
if (obj.constructor === String) {
=======
} else if (typeof (obj) === "string") {
>>>>>>>
}
if (typeof (obj) === "string") {
<<<<<<<
if (arguments.length === 3) {
return (this.x * v + this.y * y + this.z * z);
}
if (arguments.length === 1) {
=======
if (arguments.length === 1) {
>>>>>>>
if (arguments.length === 1) {
<<<<<<<
p.textLeading = function(leading) {
curTextLeading = leading;
};
function MeasureTextCanvas(fontFace, fontSize, baseLine, text) {
this.canvas = document.createElement('canvas');
this.canvas.setAttribute('width', fontSize + "px");
this.canvas.setAttribute('height', fontSize + "px");
this.ctx = this.canvas.getContext("2d");
this.ctx.font = fontSize + "pt " + fontFace;
this.ctx.fillStyle = "black";
this.ctx.fillRect(0, 0, fontSize, fontSize);
this.ctx.fillStyle = "white";
this.ctx.fillText(text, 0, baseLine);
this.imageData = this.ctx.getImageData(0, 0, fontSize, fontSize);
this.get = function(x, y) {
return this.imageData.data[((y*(this.imageData.width*4)) + (x*4))];
};
}
/**
* textAscent() height of the font above the baseline of the current font at its current size, in pixels.
*
* @returns {float} height of the font above the baseline of the current font at its current size, in pixels
*
* @see #textDescent
*/
p.textAscent = (function() {
var oldTextSize = undef,
oldTextFont = undef,
ascent = undef,
graphics = undef;
return function textAscent() {
// if text size or font has changed, recalculate ascent value
if (oldTextFont !== curTextFont || oldTextSize !== curTextSize) {
// store current size and font
oldTextFont = curTextFont;
oldTextSize = curTextSize;
var found = false,
character = "k",
colour = p.color(0),
top = 0,
bottom = curTextSize,
yLoc = curTextSize/2;
// setup off screen image to write and measure text from
graphics = new MeasureTextCanvas(curTextFont.name, curTextSize, curTextSize, character);
// binary search for highest pixel
while(yLoc !== bottom) {
for (var xLoc = 0; xLoc < curTextSize; xLoc++) {
if (graphics.get(xLoc, yLoc) !== colour) {
found = true;
xLoc = curTextSize;
}
}
if (found) {
// y--
bottom = yLoc;
found = false;
} else {
// y++
top = yLoc;
}
yLoc = Math.ceil((bottom + top)/2);
}
ascent = ((curTextSize-1) - yLoc) + 1;
return ascent;
}
// text size and font have not changed since last time
return ascent;
};
}());
/**
* textDescent() height of the font below the baseline of the current font at its current size, in pixels.
*
* @returns {float} height of the font below the baseline of the current font at its current size, in pixels
*
* @see #textAscent
*/
p.textDescent = (function() {
var oldTextSize = undef,
oldTextFont = undef,
descent = undef,
graphics = undef;
return function textDescent() {
// if text size or font has changed, recalculate descent value
if (oldTextFont !== curTextFont || oldTextSize !== curTextSize) {
// store current size and font
oldTextFont = curTextFont;
oldTextSize = curTextSize;
var found = false,
character = "p",
colour = p.color(0),
top = 0,
bottom = curTextSize,
yLoc = curTextSize/2;
// setup off screen image to write and measure text from
graphics = new MeasureTextCanvas(curTextFont.name, curTextSize, 0, character);
// binary search for lowest pixel
while(yLoc !== bottom) {
for (var xLoc = 0; xLoc < curTextSize; xLoc++) {
if (graphics.get(xLoc, yLoc) !== colour) {
found = true;
xLoc = curTextSize;
}
}
if (found) {
// y++
top = yLoc;
found = false;
} else {
// y--
bottom = yLoc;
}
yLoc = Math.ceil((bottom + top)/2);
}
descent = yLoc + 1;
return descent;
}
// text size and font have not changed since last time
return descent;
};
}());
=======
>>>>>>> |
<<<<<<<
function initTestability() {
// add data-name attributes to improve testability
$("#file_upload_dialog").parent().attr("data-name", "file_upload_dialog");
$("#locale_select_dialog").parent().attr("data-name", "locale_select_dialog");
$("button span:contains('Close')").parent().attr("data-name", "close");
$("button span:contains('OK')").parent().attr("data-name", "ok");
$("button span:contains('Cancel')").parent().attr("data-name", "cancel");
$("button span:contains('Yes')").parent().attr("data-name", "yes");
$("button span:contains('Confirm')").parent().attr("data-name", "confirm");
}
$(document).ready(function() {
initMenu();
=======
function moveButtonsToHeader() {
$("." + $("#ctrl").val() + "_actions").find("button").each(function() {
var clone = $(this).clone();
$(this).remove();
$(".button-group").append(clone);
});
}
>>>>>>>
function initTestability() {
// add data-name attributes to improve testability
$("#file_upload_dialog").parent().attr("data-name", "file_upload_dialog");
$("#locale_select_dialog").parent().attr("data-name", "locale_select_dialog");
$("button span:contains('Close')").parent().attr("data-name", "close");
$("button span:contains('OK')").parent().attr("data-name", "ok");
$("button span:contains('Cancel')").parent().attr("data-name", "cancel");
$("button span:contains('Yes')").parent().attr("data-name", "yes");
$("button span:contains('Confirm')").parent().attr("data-name", "confirm");
}
function moveButtonsToHeader() {
$("." + $("#ctrl").val() + "_actions").find("button").each(function() {
var clone = $(this).clone();
$(this).remove();
$(".button-group").append(clone);
});
}
<<<<<<<
// Misc stuff. TODO: cleanup
$('.' + $('#ctrl').val() + '_actions').find('button').each(function() {
var clone = $(this).clone();
$(this).remove();
$('.button-group').append(clone);
});
$('#server-names h2').text($('#server-names h2').text().replace(' Administration', ''));
if($('#server-names h1').text() == '')
$('#server-names h2').addClass('big');
if($('#user h2').text() == '')
$('#user h1').addClass('big');
initFileUploadDialog();
initLocaleSelectDialog();
initTestability();
=======
function initTooltips() {
>>>>>>>
function initTooltips() { |
<<<<<<<
=======
if (section === "help" && num === 1) {
section = !npm.config.get("usage") && "npm"
}
>>>>>>>
<<<<<<<
var sectionPath = path.resolve(__dirname, "..", "man1", section+".1")
, htmlPath = path.resolve( __dirname, "..", "html"
, "doc", section+".html" )
=======
var section_path = path.join( __dirname, "../man/man"
+ num + "/" + section + "." + num)
>>>>>>>
var sectionPath = path.join( __dirname, "..", "man", "man" + num
, section + "." + num)
, htmlPath = path.resolve( __dirname, "..", "html"
, num === 3 ? "api" : "doc"
, section+".html" ) |
<<<<<<<
, "unstar": "star" // same function
=======
, "apihelp" : "help"
>>>>>>>
, "unstar": "star" // same function
, "apihelp" : "help" |
<<<<<<<
portfinder.basePort = config.port
=======
const cors = require('./api/cors')
const entityRequestHandler = require('./api/entity')
const collectionRequestHandler = require('./api/collection')
>>>>>>>
const cors = require('./api/cors')
const entityRequestHandler = require('./api/entity')
const collectionRequestHandler = require('./api/collection')
portfinder.basePort = config.port |
<<<<<<<
if (options.watch) watchFile(path);
=======
// Try to watch the file if needed. watchFile takes care of duplicates.
if (options.watch) watchFile(path, null, rootPath);
var str = fs.readFileSync(path, 'utf8');
options.filename = path;
>>>>>>>
// Try to watch the file if needed. watchFile takes care of duplicates.
if (options.watch) watchFile(path, null, rootPath); |
<<<<<<<
var name = this.advance().val
, tag = new nodes.Tag(name);
return this.tag(tag);
},
tag: function(tag){
var dot;
tag.line = this.line();
=======
var tok = this.advance()
, tag = new nodes.Tag(tok.val);
tag.selfClosing = tok.selfClosing;
>>>>>>>
var tok = this.advance()
, tag = new nodes.Tag(tok.val);
tag.selfClosing = tok.selfClosing;
return this.tag(tag);
},
tag: function(tag){
var dot;
tag.line = this.line();
<<<<<<<
// self-closing
if ('/' == this.peek().val) {
this.advance();
tag.selfClosing = true;
}
=======
return this.tag(tag);
},
tag: function(tag){
var dot;
tag.line = this.line();
>>>>>>> |
<<<<<<<
import Issue16 from './Issue16';
=======
import Issue20 from './Issue20';
>>>>>>>
import Issue16 from './Issue16';
import Issue20 from './Issue20';
<<<<<<<
<li><Link to="/issues/16">16</Link></li>
=======
<li><Link to="/issues/20">20</Link></li>
>>>>>>>
<li><Link to="/issues/16">16</Link></li>
<li><Link to="/issues/20">20</Link></li> |
<<<<<<<
},
keep_translation_links: function(test) {
test.expect(1);
var actual = grunt.file.readJSON( 'test/existing/11_en_US.json' );
var expected = grunt.file.readJSON( 'test/expected/11_en_US.json' );
test.deepEqual( actual, expected, 'Should equal.' );
test.done();
},
key_as_text: function(test) {
test.expect(1);
var actual = grunt.file.read( 'tmp/12_en_US.json' );
var expected = grunt.file.read( 'test/expected/12_en_US.json' );
test.equal( actual, expected, 'Should equal.' );
test.done();
=======
},
extract_to_pot: function(test) {
test.expect(1);
var actual = grunt.file.read( 'tmp/template.pot' );
var expected = grunt.file.read( 'test/expected/template.pot' );
test.equal( actual, expected, 'Should equal.' );
test.done();
>>>>>>>
},
keep_translation_links: function(test) {
test.expect(1);
var actual = grunt.file.readJSON( 'test/existing/11_en_US.json' );
var expected = grunt.file.readJSON( 'test/expected/11_en_US.json' );
test.deepEqual( actual, expected, 'Should equal.' );
test.done();
},
key_as_text: function(test) {
test.expect(1);
var actual = grunt.file.read( 'tmp/12_en_US.json' );
var expected = grunt.file.read( 'test/expected/12_en_US.json' );
test.equal( actual, expected, 'Should equal.' );
test.done();
},
extract_to_pot: function(test) {
test.expect(1);
var actual = grunt.file.read( 'tmp/template.pot' );
var expected = grunt.file.read( 'test/expected/template.pot' );
test.equal( actual, expected, 'Should equal.' );
test.done(); |
<<<<<<<
if (Constructor.prototype.thaw === null) {
Constructor.prototype.thaw = new Thaw([]);
}
this.td = (td !== undefined ? td : null);
=======
if (td !== undefined && td !== null) {
this.td = td;
td.jSCell = this;
}
>>>>>>>
if (Constructor.prototype.thaw === null) {
Constructor.prototype.thaw = new Thaw([]);
}
if (td !== undefined && td !== null) {
this.td = td;
td.jSCell = this;
}
<<<<<<<
if (fn !== u) {
fn.call(this, this.value);
}
return;
=======
this.needsUpdated = false;
return this.value;
>>>>>>>
this.needsUpdated = false;
if (fn !== u) {
fn.call(this, this.value);
}
return;
<<<<<<<
cell.thaw.add(function() {
cell.needsUpdated = false;
Sheet.calcStack--;
=======
Sheet.calcStack--;
>>>>>>>
cell.thaw.add(function() {
Sheet.calcStack--; |
<<<<<<<
'es': otp.locale.Spanish,
'ca_ES': otp.locale.Catalan
=======
'ca_ES': otp.locale.Catalan,
'pt': otp.locale.Portuguese
>>>>>>>
'es': otp.locale.Spanish,
'pt': otp.locale.Portuguese |
<<<<<<<
new BabelMultiTargetPlugin({
normalizeModuleIds: true,
targets: {
modern: true,
legacy: {
additionalModules: [
'../_shared/hello.js',
],
},
},
}),
=======
new BabelMultiTargetPlugin({
normalizeModuleIds: true,
// babel: {
// cacheDirectory: false,
// presetOptions: {
// debug: true,
// },
// },
}),
>>>>>>>
new BabelMultiTargetPlugin({
normalizeModuleIds: true,
// babel: {
// cacheDirectory: false,
// presetOptions: {
// debug: true,
// },
// },
// targets: {
// modern: true,
// legacy: {
// additionalModules: [
// '../_shared/hello.js',
// ],
// },
// },
}), |
<<<<<<<
// Draw select region
if (state.cursor.get("selecting")) {
ctx.save();
let start_cursor_sy = cy - (state.cursor.get("row") - state.cursor.get("row_start")) * this._pattern_row_height;
let start_cursor_sx = this._event_left_margin;
start_cursor_sx += state.cursor.get("track_start") * this._pattern_cellwidth;
for(var i = 1; i <= state.cursor.get("item_start"); i += 1) {
start_cursor_sx += this._cursor_offsets[i];
}
let start_cursor_ex = start_cursor_sx + this._cursor_sizes[state.cursor.get("item_start")];
let start_cursor_ey = start_cursor_sy + this._pattern_row_height;
let end_cursor_sy = cy;
let end_cursor_sx = cx;
let end_cursor_ex = end_cursor_sx + this._cursor_sizes[state.cursor.get("item")];
let end_cursor_ey = end_cursor_sy + this._pattern_row_height;
const c1x = Math.min(start_cursor_sx, end_cursor_sx);
const c1y = Math.min(start_cursor_sy, end_cursor_sy);
const c2x = Math.max(start_cursor_ex, end_cursor_ex);
const c2y = Math.max(start_cursor_ey, end_cursor_ey);
console.log(c1x, c1y, c2x, c2y);
ctx.fillStyle = '#0F0';
ctx.strokeStyle = '#0F0';
ctx.globalAlpha = 0.2;
ctx.fillRect(c1x, c1y, c2x - c1x, c2y - c1y);
ctx.globalAlpha = 1.0;
ctx.strokeRect(c1x - 1, c1y - 1, c2x - c1x + 2, c2y - c1y + 2);
ctx.restore();
}
ctx.clearRect(0, 0, this.canvas.width, this._pattern_header_height);
=======
ctx.clearRect(0, 0, this.canvas.width, this._pattern_header_height);
ctx.lineWidth = 2;
ctx.strokeStyle = this.track_border_colour;
ctx.beginPath();
const numtracks = song.getNumTracks();
for (let i = 0; i <= numtracks; i += 1) {
var dx = i * this._pattern_cellwidth;
ctx.moveTo(dx, 0);
ctx.lineTo(dx, this.canvas.height);
}
ctx.stroke();
>>>>>>>
// Draw select region
if (state.cursor.get("selecting")) {
ctx.save();
let start_cursor_sy = cy - (state.cursor.get("row") - state.cursor.get("row_start")) * this._pattern_row_height;
let start_cursor_sx = this._event_left_margin;
start_cursor_sx += state.cursor.get("track_start") * this._pattern_cellwidth;
for(var i = 1; i <= state.cursor.get("item_start"); i += 1) {
start_cursor_sx += this._cursor_offsets[i];
}
let start_cursor_ex = start_cursor_sx + this._cursor_sizes[state.cursor.get("item_start")];
let start_cursor_ey = start_cursor_sy + this._pattern_row_height;
let end_cursor_sy = cy;
let end_cursor_sx = cx;
let end_cursor_ex = end_cursor_sx + this._cursor_sizes[state.cursor.get("item")];
let end_cursor_ey = end_cursor_sy + this._pattern_row_height;
const c1x = Math.min(start_cursor_sx, end_cursor_sx);
const c1y = Math.min(start_cursor_sy, end_cursor_sy);
const c2x = Math.max(start_cursor_ex, end_cursor_ex);
const c2y = Math.max(start_cursor_ey, end_cursor_ey);
ctx.fillStyle = '#0F0';
ctx.strokeStyle = '#0F0';
ctx.globalAlpha = 0.2;
ctx.fillRect(c1x, c1y, c2x - c1x, c2y - c1y);
ctx.globalAlpha = 1.0;
ctx.strokeRect(c1x - 1, c1y - 1, c2x - c1x + 2, c2y - c1y + 2);
ctx.restore();
}
ctx.clearRect(0, 0, this.canvas.width, this._pattern_header_height);
ctx.lineWidth = 2;
ctx.strokeStyle = this.track_border_colour;
ctx.beginPath();
const numtracks = song.getNumTracks();
for (let i = 0; i <= numtracks; i += 1) {
var dx = i * this._pattern_cellwidth;
ctx.moveTo(dx, 0);
ctx.lineTo(dx, this.canvas.height);
}
ctx.stroke(); |
<<<<<<<
let show_payout = !is_status_expired && !is_status_done;
=======
let show_advanced_payout = isBountyOwner(result) && !is_status_expired && !is_status_done;
let show_extend_deadline = isBountyOwner(result) && !is_status_expired && !is_status_done;
>>>>>>>
let show_payout = !is_status_expired && !is_status_done;
let show_advanced_payout = isBountyOwner(result) && !is_status_expired && !is_status_done;
let show_extend_deadline = isBountyOwner(result) && !is_status_expired && !is_status_done; |
<<<<<<<
=======
};
if (isSendingETH) {
web3.eth.sendTransaction({
to: destinationAccount,
value: amountInWei,
gasPrice: web3.toHex(get_gas_price())
}, post_send_callback);
} else {
_alert({ message: gettext('You will now be asked to confirm two transactions. The first is gas money, so your receipient doesnt have to pay it. The second is the actual token transfer.') }, 'info');
web3.eth.sendTransaction({
to: destinationAccount,
value: gas_money,
gasPrice: web3.toHex(get_gas_price())
}, function() {
var token_contract = web3.eth.contract(token_abi).at(tokenAddress);
token_contract.transfer(destinationAccount, amountInWei, {gasPrice: web3.toHex(get_gas_price())}, post_send_callback);
});
>>>>>>> |
<<<<<<<
if (typeof ga !== 'undefined') {
ga('send', 'event', 'Saved profile onboard', 'click', 'Person');
}
=======
dataLayer.push({
'event': 'send',
'category': 'onboard',
'action': 'saved-profile-onboard'
});
>>>>>>>
dataLayer.push({
'event': 'send',
'category': 'onboard',
'action': 'saved-profile-onboard'
});
if (typeof ga !== 'undefined') {
ga('send', 'event', 'Saved profile onboard', 'click', 'Person');
} |
<<<<<<<
bountyDetails = [ bountyAmount, result[1], result[2], result[3] ];
var fromAddress = result[2];
var open = result[4];
var initialized = result[5];
var errormsg = undefined;
if (bountyAmount == 0 || open == false || initialized == false) {
errormsg = 'No active funded issue found at this address. Are you sure this is an active funded issue?';
=======
var estimateGas = function(issueURL, success_callback, failure_calllback, final_callback){
var bounty = web3.eth.contract(bounty_abi).at(bounty_address());
$("#gasLimit").addClass('loading');
bounty.clawbackExpiredBounty.estimateGas(
issueURL,
function(errors,result){
$("#gasLimit").removeClass('loading');
var is_issue_taken = typeof result == 'undefined' || result > 1403207;
if(errors || is_issue_taken){
failure_calllback(errors);
return;
}
var gas = Math.round(result * gasMultiplier);
var gasLimit = Math.round(gas * gasLimitMultiplier);
success_callback(gas, gasLimit, final_callback);
});
};
//updates recommended metamask settings
var updateInlineGasEstimate = function(){
var issueURL = $('input[name=issueURL]').val();
var success_callback = function(gas, gasLimit, _){
$("#gasLimit").val(gas);
update_metamask_conf_time_and_cost_estimate();
};
var failure_callback = function(errors){
$("#gasLimit").val('Unknown');
update_metamask_conf_time_and_cost_estimate();
};
var final_callback = function(){};
//estimateGas(issueURL, success_callback, failure_callback, final_callback);
success_callback(86936,86936,'');
};
setTimeout(function(){
updateInlineGasEstimate();
},100);
$('input').change(updateInlineGasEstimate);
$('#gasPrice').keyup(update_metamask_conf_time_and_cost_estimate);
$('#submitBounty').click(function(e){
mixpanel.track("Clawback Bounty Clicked", {});
loading_button($('#submitBounty'));
e.preventDefault();
var issueURL = $('input[name=issueURL]').val();
var isError = false;
if($('#terms:checked').length == 0){
_alert({ message: "Please accept the terms of service." });
isError = true;
} else {
localStorage['acceptTOS'] = true;
>>>>>>>
bountyDetails = [ bountyAmount, result[1], result[2], result[3] ];
var fromAddress = result[2];
var open = result[4];
var initialized = result[5];
var errormsg = undefined;
if (bountyAmount == 0 || open == false || initialized == false) {
errormsg = 'No active funded issue found at this address. Are you sure this is an active funded issue?';
<<<<<<<
=======
var bounty = web3.eth.contract(bounty_abi).at(bounty_address());
var _callback = function(error, result){
var ignore_error = false;
if(error){
console.error(error);
mixpanel.track("Clawback Bounty Error", {step: '_callback', error: error});
ignore_error = String(error).indexOf('BigNumber') != -1;
}
var run_main = !error || ignore_error;
if(error && !ignore_error){
_alert({ message: "Could not get bounty details." });
unloading_button($('#submitBounty'));
}
if(run_main){
if(!ignore_error){
var bountyAmount = result[0].toNumber();
bountyDetails = [bountyAmount, result[1], result[2], result[3]];
var fromAddress = result[2];
var open = result[4];
var initialized = result[5];
var errormsg = undefined;
if(bountyAmount == 0 || open == false || initialized == false){
errormsg = "No active funded issue found at this address. Are you sure this is an active funded issue?";
}
if(fromAddress != web3.eth.coinbase){
errormsg = "Only the address that submitted this funded issue may submit a clawback.";
}
if(errormsg){
_alert({ message: errormsg });
unloading_button($('#submitBounty'));
return;
}
}
var final_callback = function(error, result){
var next = function(){
localStorage['txid'] = result;
sync_web3(issueURL);
localStorage[issueURL] = timestamp();
_alert({ message: "Clawback submitted to web3." },'info');
setTimeout(function(){
mixpanel.track("Clawback Bounty Success", {});
document.location.href= "/funding/details?url="+issueURL;
},1000);
};
if(error){
mixpanel.track("Clawback Bounty Error", {step: 'callback', error: error});
console.error("err", error);
_alert({ message: "There was an error" });
unloading_button($('#submitBounty'));
} else {
next();
}
};
setTimeout(function(){
var failure_calllback = function(errors){
_alert({ message: "This issue cannot be clawed back. Please leave a comment <a href=https://github.com/gitcoinco/web/issues/169>here</a> if you need help." });
console.error(errors);
mixpanel.track("Clawback Bounty Error", {step: 'estimateGas', error: errors});
unloading_button($('#submitBounty'));
return;
}
var success_callback = function(gas, gasLimit, final_callback){
var bounty = web3.eth.contract(bounty_abi).at(bounty_address());
bounty.clawbackExpiredBounty.sendTransaction(issueURL,
{
from : account,
gas:web3.toHex(gas),
gasLimit: web3.toHex(gasLimit),
gasPrice:web3.toHex($("#gasPrice").val() * 10**9),
},
final_callback);
};
estimateGas(issueURL, success_callback, failure_calllback, final_callback);
},100);
e.preventDefault();
}
>>>>>>> |
<<<<<<<
handleHoursInput: function(input, event) {
var value = input.value,
valid = false,
newHours;
var reg = new RegExp('^([0-9]){1,2}$');
if (reg.test(value)) {
newHours = parseInt(value);
if (this.options.hourFormat === '12') {
if (newHours >= 1 || newHours <= 12) {
//TODO: validateTime; https://github.com/primefaces/primefaces/pull/5377
valid = true;
}
} else {
if (newHours >= 0 || newHours <= 23) {
//TODO: validateTime; https://github.com/primefaces/primefaces/pull/5377
valid = true;
}
}
}
if (!valid) {
event.preventDefault();
input.value = this.oldHours;
return;
}
var newDateTime = (this.value && this.value instanceof Date) ? new Date(this.value) : new Date();
newDateTime.setHours(newHours);
this.updateTimeAfterInput(event, newDateTime);
},
handleMinutesInput: function(input, event) {
var value = input.value,
valid = false,
newMinutes;
var reg = new RegExp('^([0-9]){1,2}$');
if (reg.test(value)) {
newMinutes = parseInt(value);
if (newMinutes >= 0 || newMinutes <= 59) {
//TODO: validateTime; https://github.com/primefaces/primefaces/pull/5377
valid = true;
}
}
if (!valid) {
event.preventDefault();
input.value = this.oldMinutes;
return;
}
var newDateTime = (this.value && this.value instanceof Date) ? new Date(this.value) : new Date();
newDateTime.setMinutes(newMinutes);
this.updateTimeAfterInput(event, newDateTime);
},
handleSecondsInput: function(input, event) {
var value = input.value,
valid = false,
newSeconds;
var reg = new RegExp('^([0-9]){1,2}$');
if (reg.test(value)) {
newSeconds = parseInt(value);
if (newSeconds >= 0 || newSeconds <= 59) {
//TODO: validateTime; https://github.com/primefaces/primefaces/pull/5377
valid = true;
}
}
if (!valid) {
event.preventDefault();
input.value = this.oldSeconds;
return;
}
var newDateTime = (this.value && this.value instanceof Date) ? new Date(this.value) : new Date();
newDateTime.setSeconds(newSeconds);
this.updateTimeAfterInput(event, newDateTime);
},
validateHour: function (hour, value) {
var valid = true,
valueDateString = value ? value.toDateString() : null;
=======
validateTime: function(hour, minute, second, value, direction) {
var valid = true;
var dateNew = new Date(value.getFullYear(), value.getMonth(), value.getDate(), hour, minute, second, 0);
>>>>>>>
handleHoursInput: function(input, event) {
var value = input.value,
valid = false,
newHours;
var reg = new RegExp('^([0-9]){1,2}$');
if (reg.test(value)) {
newHours = parseInt(value);
if (this.options.hourFormat === '12') {
if (newHours >= 1 || newHours <= 12) {
//TODO: validateTime; https://github.com/primefaces/primefaces/pull/5377
valid = true;
}
} else {
if (newHours >= 0 || newHours <= 23) {
//TODO: validateTime; https://github.com/primefaces/primefaces/pull/5377
valid = true;
}
}
}
if (!valid) {
event.preventDefault();
input.value = this.oldHours;
return;
}
var newDateTime = (this.value && this.value instanceof Date) ? new Date(this.value) : new Date();
newDateTime.setHours(newHours);
this.updateTimeAfterInput(event, newDateTime);
},
handleMinutesInput: function(input, event) {
var value = input.value,
valid = false,
newMinutes;
var reg = new RegExp('^([0-9]){1,2}$');
if (reg.test(value)) {
newMinutes = parseInt(value);
if (newMinutes >= 0 || newMinutes <= 59) {
//TODO: validateTime; https://github.com/primefaces/primefaces/pull/5377
valid = true;
}
}
if (!valid) {
event.preventDefault();
input.value = this.oldMinutes;
return;
}
var newDateTime = (this.value && this.value instanceof Date) ? new Date(this.value) : new Date();
newDateTime.setMinutes(newMinutes);
this.updateTimeAfterInput(event, newDateTime);
},
handleSecondsInput: function(input, event) {
var value = input.value,
valid = false,
newSeconds;
var reg = new RegExp('^([0-9]){1,2}$');
if (reg.test(value)) {
newSeconds = parseInt(value);
if (newSeconds >= 0 || newSeconds <= 59) {
//TODO: validateTime; https://github.com/primefaces/primefaces/pull/5377
valid = true;
}
}
if (!valid) {
event.preventDefault();
input.value = this.oldSeconds;
return;
}
var newDateTime = (this.value && this.value instanceof Date) ? new Date(this.value) : new Date();
newDateTime.setSeconds(newSeconds);
this.updateTimeAfterInput(event, newDateTime);
},
validateTime: function(hour, minute, second, value, direction) {
var valid = true;
var dateNew = new Date(value.getFullYear(), value.getMonth(), value.getDate(), hour, minute, second, 0); |
<<<<<<<
$('#btn_gif').click(function(e) {
e.preventDefault();
closeBackgroundDropdown(e);
deselectGif(e);
$('#poll-button').removeClass('selected');
$('#poll_container').remove();
});
var selectedElement = null;
// handle background selection
$('.bg-thumbnail').click(function(e) {
e.preventDefault();
$('#bg-selector').children('div').children('div').addClass('hide');
$(this).children('div').removeClass('hide');
selectedElement = $(this);
$('#bg-selector').attr('data-selected', $(this).attr('data-bg-name'));
embedded_resource = $(this).attr('data-bg-name');
});
// handle add background button push
$('body').on('click', '#background-button', function(e) {
e.preventDefault();
$('#bg-selector').toggleClass('hide');
if ($('#bg-selector').hasClass('hide')) {
closeBackgroundDropdown(e);
}
$('#poll-button').removeClass('selected');
$('#poll_container').remove();
deselectGif(e);
});
document.is_shift = false;
// handle shift button
$('body').on('keyup', '#textarea', function(e) {
if (e.keyCode == 16) {
document.is_shift = false;
}
});
// handle shift button
=======
// handle poll button
>>>>>>>
$('#btn_gif').click(function(e) {
e.preventDefault();
closeBackgroundDropdown(e);
deselectGif(e);
$('#poll-button').removeClass('selected');
$('#poll_container').remove();
});
var selectedElement = null;
// handle background selection
$('.bg-thumbnail').click(function(e) {
e.preventDefault();
$('#bg-selector').children('div').children('div').addClass('hide');
$(this).children('div').removeClass('hide');
selectedElement = $(this);
$('#bg-selector').attr('data-selected', $(this).attr('data-bg-name'));
embedded_resource = $(this).attr('data-bg-name');
});
// handle add background button push
$('body').on('click', '#background-button', function(e) {
e.preventDefault();
$('#bg-selector').toggleClass('hide');
if ($('#bg-selector').hasClass('hide')) {
closeBackgroundDropdown(e);
}
$('#poll-button').removeClass('selected');
$('#poll_container').remove();
deselectGif(e);
});
document.is_shift = false;
// handle shift button
$('body').on('keyup', '#textarea', function(e) {
if (e.keyCode == 16) {
document.is_shift = false;
}
});
// handle shift button
<<<<<<<
=======
if ($('#video_container').length) {
data.append('has_video', $('#video_container').length);
data.append('video_gfx', $('#video_container').data('gfx'));
}
>>>>>>>
if ($('#video_container').length) {
data.append('has_video', $('#video_container').length);
data.append('video_gfx', $('#video_container').data('gfx'));
} |
<<<<<<<
text: gettext('Work Accepted'),
created_on: fulfillment.created_on,
age: timeDifference(new Date(result['now']), new Date(fulfillment.created_on)),
=======
text: 'Work Accepted',
age: timeDifference(new Date(result['now']), new Date(fulfillment.accepted_on)),
>>>>>>>
text: gettext('Work Accepted'),
age: timeDifference(new Date(result['now']), new Date(fulfillment.accepted_on)), |
<<<<<<<
result['p'] = work_scheme + ((result['experience_level'] ? result['experience_level'] : 'Unknown Experience Level') + ' • ');
=======
result['p'] = ((result['experience_level'] ? result['experience_level'] + ' • ' : ''));
>>>>>>>
result['p'] = work_scheme + ((result['experience_level'] ? result['experience_level'] + ' • ' : '')); |
<<<<<<<
var fail_callback = function() {
message.val(the_message);
localStorage.setItem(lskey, the_message);
_alert(
{ message: gettext('An error occurred. Please try again.') },
'error'
);
};
=======
for (var i = 0; i < 5; i++) {
var val = $('#poll_container input[name=option' + i + ']').val();
if (val) {
data.append('option' + i, val);
}
}
$('#poll_container').remove();
>>>>>>>
var fail_callback = function() {
message.val(the_message);
localStorage.setItem(lskey, the_message);
_alert(
{ message: gettext('An error occurred. Please try again.') },
'error'
);
};
for (var i = 0; i < 5; i++) {
var val = $('#poll_container input[name=option' + i + ']').val();
if (val) {
data.append('option' + i, val);
}
}
$('#poll_container').remove(); |
<<<<<<<
global.locusReadLine = require('readline').createInterface({
input: process.stdin,
output: process.stdout,
completer: completer
});
=======
global.locusDone = true;
>>>>>>>
global.locusReadLine = require('readline').createInterface({
input: process.stdin,
output: process.stdout,
completer: completer
});
global.locusDone = true;
<<<<<<<
var globals;
=======
deasync.loopWhile(function(){ return !locusDone });
global.locusDone = false;
var localDone = false;
var color = require(global.locusModules.color);
var util = require('util');
var rl = require('readline').createInterface({
input: process.stdin,
output: process.stdout
});
>>>>>>>
deasync.loopWhile(function(){ return !locusDone });
global.locusDone = false;
var localDone = false;
var color = require(global.locusModules.color);
var util = require('util');
var rl = require('readline').createInterface({
input: process.stdin,
output: process.stdout
}); |
<<<<<<<
=======
PrimeFaces.csp.NONCE_VALUE = nonce;
>>>>>>>
PrimeFaces.csp.NONCE_VALUE = nonce; |
<<<<<<<
/**
* Replaces all line breaks with a Window-style line break (carriage return + line feed).
* @private
* @param {string} text Text to normalize.
* @return {string} The given text, with all line breaks replaced with carriage return + line feed.
*/
normalizeNewlines: function(text) {
return text.replace(/(\r\n|\r|\n)/g, '\r\n');
},
/**
* Sets up the server-side auto complete functionality that suggests tokens while the user types.
* @private
*/
=======
>>>>>>>
/**
* Sets up the server-side auto complete functionality that suggests tokens while the user types.
* @private
*/ |
<<<<<<<
import FlowProvider from './dialog/provider'
import StateManager from './dialog/state'
import DialogEngine from './dialog/engine'
import DialogProcessors from './dialog/processors'
import DialogJanitor from './dialog/janitor'
import SkillsManager from './skills'
=======
import createConversations from './conversations'
import createHelpers from './helpers'
>>>>>>>
import FlowProvider from './dialog/provider'
import StateManager from './dialog/state'
import DialogEngine from './dialog/engine'
import DialogProcessors from './dialog/processors'
import DialogJanitor from './dialog/janitor'
import SkillsManager from './skills'
import createHelpers from './helpers'
<<<<<<<
for (const mod of _.values(loadedModules)) {
mod.handlers.ready && mod.handlers.ready(this, mod.configuration)
=======
for (let mod of _.values(loadedModules)) {
mod.handlers.ready && mod.handlers.ready(this, mod.configuration, createHelpers)
>>>>>>>
for (const mod of _.values(loadedModules)) {
mod.handlers.ready && mod.handlers.ready(this, mod.configuration, createHelpers) |
<<<<<<<
init: async (bp, configurator, helpers) => {
=======
// eslint-disable-next-line no-unused-vars
init: async function(bp, configurator, helpers) {
>>>>>>>
// eslint-disable-next-line no-unused-vars
init: async (bp, configurator, helpers) => {
<<<<<<<
ready: async (bp, configurator, helpers) => {
=======
// eslint-disable-next-line no-unused-vars
ready: async function(bp, configurator, helpers) {
>>>>>>>
// eslint-disable-next-line no-unused-vars
ready: async (bp, configurator, helpers) => { |
<<<<<<<
const requireExtension = (file, edition) => {
edition = edition || process.env.BOTPRESS_EDITION || DEFAULT_EDITION
=======
function requireExtension(file, edition) {
const editions = ['ultimate', 'pro', 'lite']
edition = edition ? edition : process.env.BOTPRESS_EDITION || 'lite'
file = path.normalize(file)
>>>>>>>
const requireExtension = (file, edition) => {
edition = edition || process.env.BOTPRESS_EDITION || DEFAULT_EDITION
file = path.normalize(file) |
<<<<<<<
/**
* @override
* @inheritdoc
* @param {PrimeFaces.PartialWidgetCfg<TCfg, this>} cfg
*/
init: function(cfg) {
=======
init: function (cfg) {
>>>>>>>
/**
* @override
* @inheritdoc
* @param {PrimeFaces.PartialWidgetCfg<TCfg, this>} cfg
*/
init: function (cfg) { |
<<<<<<<
author: packageJson.author || '<no author>',
license: packageJson.license || 'AGPL-3.0-only'
=======
author: (typeof packageJson.author === 'object' ? packageJson.author.name : packageJson.author) || '<no author>',
license: packageJson.license || 'AGPL-v3.0'
>>>>>>>
author: (typeof packageJson.author === 'object' ? packageJson.author.name : packageJson.author) || '<no author>',
license: packageJson.license || 'AGPL-3.0-only' |
<<<<<<<
function applySnapshot(state, snapshot) {
return {
...state,
currentFlow: snapshot.activeFlow,
currentFlowNode: snapshot.activeFlowNode,
flowsByName: snapshot.flowsByName
}
}
function createSnapshot(state) {
const snapshot = {
activeFlow: state.currentFlow,
activeFlowNode: state.currentFlowNode,
flowsByName: Object.assign({}, state.flowsByName)
}
const lastSnapshot = _.head(state.snapshots)
let snapshots = _.take(state.snapshots, SNAPSHOT_SIZE)
if (
state.currentSnapshotIndex === 0 &&
state.snapshots.length > 1 &&
lastSnapshot &&
snapshot.activeFlow === lastSnapshot.activeFlow &&
(!!snapshot.activeFlowNode && snapshot.activeFlowNode === lastSnapshot.activeFlowNode)
) {
snapshots = _.drop(snapshots, 1) // We merge the current and last snapshots
}
return {
...state,
snapshots: [snapshot, ...snapshots],
currentSnapshotIndex: 0
}
}
function findNodesThatReferenceFlow(state, flowName) {
let nodes = []
for (let flow of _.values(state.flowsByName)) {
for (let node of flow.nodes) {
if (node.flow === flowName || _.find(node.next, { node: flowName })) {
nodes.push(node.id)
}
}
}
return nodes
}
function copyName(siblingNames, nameToCopy) {
let copies = siblingNames.filter(name => name.startsWith(`${nameToCopy}-copy`))
if (!copies.length) {
return `${nameToCopy}-copy`
}
let i = 1
while (true) {
if (!copies.find(name => name === `${nameToCopy}-copy-${i}`)) {
return `${nameToCopy}-copy-${i}`
} else {
i += 1
}
}
}
=======
>>>>>>>
function applySnapshot(state, snapshot) {
return {
...state,
currentFlow: snapshot.activeFlow,
currentFlowNode: snapshot.activeFlowNode,
flowsByName: snapshot.flowsByName
}
}
function findNodesThatReferenceFlow(state, flowName) {
let nodes = []
for (let flow of _.values(state.flowsByName)) {
for (let node of flow.nodes) {
if (node.flow === flowName || _.find(node.next, { node: flowName })) {
nodes.push(node.id)
}
}
}
return nodes
}
<<<<<<<
if (value.node.includes('.flow.json') || value.node === 'END' || value.node.startsWith('#')) {
remapNode = value.node
=======
if ((_.isString(value) && value.includes('.flow.json')) || value === 'END') {
remapNode = value
>>>>>>>
if (value.node.includes('.flow.json') || value.node === 'END' || value.node.startsWith('#')) {
remapNode = value.node |
<<<<<<<
=======
app.get('/*', (req, res) => {
const absolutePath = path.join(__dirname, 'static/index.html')
res.contentType('text/html')
res.sendFile(absolutePath)
})
app.use('/admin', express.static(path.join(__dirname, 'static/admin/index.html')))
// app.get(/^(?!\/api.*$).*/i, (req, res) => {
// res.contentType('text/html')
// res.sendFile(path.join(__dirname, 'static/admin/index.html'))
// })
return app.listen(proxyPort, callback)
>>>>>>> |
<<<<<<<
downsample: OPTIONS_DOWNSAMPLE_DEFAULT,
lines: {
=======
lines: { show: false },
pie: {
>>>>>>>
lines: { show: false },
pie: {
<<<<<<<
downsample: OPTIONS_DOWNSAMPLE_DEFAULT,
lines: { show: true, lineWidth: 1, fill: 1},
=======
lines: { show: false },
>>>>>>>
downsample: OPTIONS_DOWNSAMPLE_DEFAULT,
lines: { show: false }, |
<<<<<<<
done: function(done){
=======
error: false,
done: function(done, response){
>>>>>>>
error: false,
done: function(done){ |
<<<<<<<
var util = require('util');
=======
// nbb-core
var utils = nbbpath.require('../public/js/utils');
var utils = nbbpath.require('./batch');
>>>>>>>
var util = require('util');
var batch = nbbpath.require('/src/batch');
<<<<<<<
Data.processIdsSet = function(setKey, process, options, callback) {
if (typeof options === 'function') {
callback = options;
options = {};
}
callback = typeof callback === 'function' ? callback : function(){};
options = options || {};
if (typeof process !== 'function') {
throw new Error(process + ' is not a function');
}
// custom done condition
options.doneIf = typeof options.doneIf === 'function' ? options.doneIf : function(){};
var batch = options.batch || DEFAULT_BATCH_SIZE;
if (db.helpers.mongo && !utils.isNumber(options.alwaysStartAt)) {
var cursor = db.client.collection('objects').find({'_key': setKey}).sort({'score': 1}).project({'_id': 0, 'value': 1}).batchSize(batch);
var ids = [];
cursor.forEach(function(doc) {
ids.push(doc.value);
if (ids.length >= batch) {
process(null, ids, function(err) {
// do nothing
});
ids = [];
}
}, function(err) {
if (err) {
return callback(err);
}
if (ids.length) {
return process(null, ids, callback);
}
callback(null);
});
return;
}
// always start at, useful when deleting all records
// options.alwaysStartAt
var start = 0;
var end = batch;
var done = false;
async.whilst(
function(err) {
if (err) {
return true;
}
return !done;
},
function(next) {
db.getSortedSetRange(setKey, start, end, function(err, ids) {
if (err) {
return next(err);
}
if (!ids.length || options.doneIf(start, end, ids)) {
done = true;
return next();
}
process(err, ids, function(err) {
if (err) {
return next(err);
}
start += util.isNumber(options.alwaysStartAt) ? options.alwaysStartAt : batch + 1;
end = start + batch;
next();
});
})
},
callback
);
};
=======
>>>>>>>
Data.processIdsSet = function(setKey, process, options, callback) {
if (typeof options === 'function') {
callback = options;
options = {};
}
callback = typeof callback === 'function' ? callback : function(){};
options = options || {};
if (typeof process !== 'function') {
throw new Error(process + ' is not a function');
}
// custom done condition
options.doneIf = typeof options.doneIf === 'function' ? options.doneIf : function(){};
var batch = options.batch || DEFAULT_BATCH_SIZE;
if (db.helpers.mongo && !utils.isNumber(options.alwaysStartAt)) {
var cursor = db.client.collection('objects').find({'_key': setKey}).sort({'score': 1}).project({'_id': 0, 'value': 1}).batchSize(batch);
var ids = [];
cursor.forEach(function(doc) {
ids.push(doc.value);
if (ids.length >= batch) {
process(null, ids, function(err) {
// do nothing
});
ids = [];
}
}, function(err) {
if (err) {
return callback(err);
}
if (ids.length) {
return process(null, ids, callback);
}
callback(null);
});
return;
}
// always start at, useful when deleting all records
// options.alwaysStartAt
var start = 0;
var end = batch;
var done = false;
async.whilst(
function(err) {
if (err) {
return true;
}
return !done;
},
function(next) {
db.getSortedSetRange(setKey, start, end, function(err, ids) {
if (err) {
return next(err);
}
if (!ids.length || options.doneIf(start, end, ids)) {
done = true;
return next();
}
process(err, ids, function(err) {
if (err) {
return next(err);
}
start += util.isNumber(options.alwaysStartAt) ? options.alwaysStartAt : batch + 1;
end = start + batch;
next();
});
})
},
callback
);
}; |
<<<<<<<
messages.forEach(([type, message, status], i) => {
let color,
typeString,
=======
messages.forEach(([type, message], i) => {
let color = 'white',
typeString = ' [unknown] ',
>>>>>>>
messages.forEach(([type, message, status], i) => {
let color,
typeString,
messages.forEach(([type, message], i) => {
let color = 'white',
typeString = ' [unknown] ', |
<<<<<<<
data = JSON.parse(data);
=======
$('#operations-spinner').addClass('hidden');
>>>>>>>
data = JSON.parse(data);
$('#operations-spinner').addClass('hidden');
<<<<<<<
data = JSON.parse(data);
=======
$('#apps-spinner').addClass('hidden');
>>>>>>>
data = JSON.parse(data);
$('#apps-spinner').addClass('hidden');
<<<<<<<
data = JSON.parse(data);
=======
$('#policy-spinner').addClass('hidden');
>>>>>>>
data = JSON.parse(data);
$('#policy-spinner').addClass('hidden'); |
<<<<<<<
if (canResetPassword) {
viewModel.users[i].canEdit = true;
}
viewModel.roles[i].adminUser = $("#user-table").data("user");
=======
viewModel.users[i].adminUser = $("#user-table").data("user");
>>>>>>>
if (canResetPassword) {
viewModel.users[i].canEdit = true;
}
viewModel.users[i].adminUser = $("#user-table").data("user"); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.