diff --git a/Gruntfile.js b/Gruntfile.js index cd453635..d2461cbf 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -11,6 +11,25 @@ */ module.exports = function(grunt) { + + var piskelScripts = require('./piskel-script-list.js').scripts; + var getGhostConfig = function (delay) { + return { + filesSrc : ['tests/integration/casperjs/*_test.js'], + options : { + args : { + baseUrl : 'http://localhost:' + '<%= connect.www.options.port %>/', + mode : '?debug', + delay : delay + }, + direct : false, + logLevel : 'info', + printCommand : false, + printFilePaths : true + } + }; + }; + grunt.initConfig({ jshint: { /*options: { @@ -38,30 +57,20 @@ module.exports = function(grunt) { www : { options : { base : '.', - port : 4545 + port : 7357 } } }, ghost : { - dist : { - filesSrc : ['tests/integration/casperjs/*_test.js'], - options : { - args : { - baseUrl : 'http://localhost:' + '<%= connect.www.options.port %>/' - }, - direct : false, - logLevel : 'debug', - printCommand : false, - printFilePaths : true - } - } + default : getGhostConfig(3000), + local : getGhostConfig(50) }, concat : { options : { separator : ';', }, dist : { - src : require('./script-load-list.js').scripts, + src : piskelScripts, dest : 'build/piskel-packaged.js', }, }, @@ -93,7 +102,8 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-leading-indent'); grunt.registerTask('lint', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint']); - grunt.registerTask('test', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint', 'connect', 'ghost']); + grunt.registerTask('test', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint', 'connect', 'ghost:default']); + grunt.registerTask('precommit', ['leadingIndent:jsFiles', 'leadingIndent:cssFiles', 'jshint', 'connect', 'ghost:local']); grunt.registerTask('default', ['jshint', 'concat', 'uglify']); }; diff --git a/cheap-partials.js b/cheap-partials.js new file mode 100644 index 00000000..0b4dae45 --- /dev/null +++ b/cheap-partials.js @@ -0,0 +1,7 @@ +// SUPER CHEAP TEMPLATES ! +window._ctl = function (event) { + var iframe=event.target || event.srcElement, div=document.createElement("div"); + div.innerHTML = iframe.contentWindow.document.body.innerHTML; + if (div.children.length == 1) div = div.children[0]; + iframe.parentNode.replaceChild(div, iframe); +}; \ No newline at end of file diff --git a/index.html b/index.html index e453d74c..cbf0d05e 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,6 @@ - Piskel @@ -16,85 +15,24 @@ +
-
-
-
-
    -
    -
    - - -
    -
    -
    - -
    -
    -
    -
    -
    -
    +
    -
    -
    - -
    -
    - GIF -
    -
    - PNG -
    -
    -
    -
    -
    -
    - Canvas settings: -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    + +
    - -
    -
    -
      -
      -
      -
      -
      +
      @@ -106,55 +44,11 @@
      -
      -
      -
      -
      -
      - 12 FPS - -
      -
      +
      - + diff --git a/js/lib/gif/gif.worker.js b/js/lib/gif/gif.worker.js index 97f84c26..d2be02ac 100644 --- a/js/lib/gif/gif.worker.js +++ b/js/lib/gif/gif.worker.js @@ -2,7 +2,11 @@ var worker = function () { (function(b){function a(b,d){if({}.hasOwnProperty.call(a.cache,b))return a.cache[b];var e=a.resolve(b);if(!e)throw new Error('Failed to resolve module '+b);var c={id:b,require:a,filename:b,exports:{},loaded:!1,parent:d,children:[]};d&&d.children.push(c);var f=b.slice(0,b.lastIndexOf('/')+1);return a.cache[b]=c.exports,e.call(c.exports,c,c.exports,f,b),c.loaded=!0,a.cache[b]=c.exports}a.modules={},a.cache={},a.resolve=function(b){return{}.hasOwnProperty.call(a.modules,b)?a.modules[b]:void 0},a.define=function(b,c){a.modules[b]=c},a.define('/gif.worker.coffee',function(d,e,f,g){var b,c;b=a('/GIFEncoder.js',d),c=function(a){var c,d,e;return c=new b(a.width,a.height),a.index===0?c.writeHeader():c.firstFrame=!1,c.setRepeat(a.repeat),c.setDelay(a.delay),c.setQuality(a.quality),c.addFrame(a.data),a.last&&c.finish(),d=c.stream(),a.data=d.pages,a.cursor=d.cursor,a.pageSize=d.constructor.pageSize,a.canTransfer?(e=function(c){var d;for(var b=0,e=a.data.length;b=c.pageSize&&this.newPage(),this.pages[this.page][this.cursor++]=a},c.prototype.writeUTFBytes=function(b){for(var c=b.length,a=0;a=0&&(this.dispose=a)},b.prototype.setRepeat=function(a){this.repeat=a},b.prototype.setTransparent=function(a){this.transparent=a},b.prototype.addFrame=function(a){this.image=a,this.getImagePixels(),this.analyzePixels(),this.firstFrame&&(this.writeLSD(),this.writePalette(),this.repeat>=0&&this.writeNetscapeExt()),this.writeGraphicCtrlExt(),this.writeImageDesc(),this.firstFrame||this.writePalette(),this.writePixels(),this.firstFrame=!1},b.prototype.finish=function(){this.out.writeByte(59)},b.prototype.setQuality=function(a){a<1&&(a=1),this.sample=a},b.prototype.writeHeader=function(){this.out.writeUTFBytes('GIF89a')},b.prototype.analyzePixels=function(){var g=this.pixels.length,d=g/3;this.indexedPixels=new Uint8Array(d);var a=new f(this.pixels,this.sample);a.buildColormap(),this.colorTab=a.getColormap();var b=0;for(var c=0;c>16,l=(e&65280)>>8,m=e&255,c=0,d=16777216,j=this.colorTab.length;for(var a=0;a=0&&(a=dispose&7),a<<=2,this.out.writeByte(0|a|0|b),this.writeShort(this.delay),this.out.writeByte(this.transIndex),this.out.writeByte(0)},b.prototype.writeImageDesc=function(){this.out.writeByte(44),this.writeShort(0),this.writeShort(0),this.writeShort(this.width),this.writeShort(this.height),this.firstFrame?this.out.writeByte(0):this.out.writeByte(128|this.palSize)},b.prototype.writeLSD=function(){this.writeShort(this.width),this.writeShort(this.height),this.out.writeByte(240|this.palSize),this.out.writeByte(0),this.out.writeByte(0)},b.prototype.writeNetscapeExt=function(){this.out.writeByte(33),this.out.writeByte(255),this.out.writeByte(11),this.out.writeUTFBytes('NETSCAPE2.0'),this.out.writeByte(3),this.out.writeByte(1),this.writeShort(this.repeat),this.out.writeByte(0)},b.prototype.writePalette=function(){this.out.writeBytes(this.colorTab);var b=768-this.colorTab.length;for(var a=0;a>8&255)},b.prototype.writePixels=function(){var a=new g(this.width,this.height,this.indexedPixels,this.colorDepth);a.encode(this.out)},b.prototype.stream=function(){return this.out},e.exports=b}),a.define('/LZWEncoder.js',function(e,g,h,i){function f(y,D,C,B){function w(a,b){r[f++]=a,f>=254&&t(b)}function x(b){u(a),k=i+2,j=!0,l(i,b)}function u(b){for(var a=0;a=0){y=w-d,d===0&&(y=1);do if((d-=y)<0&&(d+=w),h[d]===g){e=n[d];continue a}while(h[d]>=0)}l(e,r),e=t,k<1<0&&(a.writeByte(f),a.writeBytes(r,0,f),f=0)}function p(a){return(1<0?g|=a<=8)w(g&255,c),g>>=8,e-=8;if((k>m||j)&&(j?(m=p(n_bits=q),j=!1):(++n_bits,n_bits==b?m=1<0)w(g&255,c),g>>=8,e-=8;t(c)}}var s=Math.max(2,B),r=new Uint8Array(256),h=new Int32Array(a),n=new Int32Array(a),g,e=0,f,k=0,m,j=!1,q,i,o;this.encode=z}var c=-1,b=12,a=5003,d=[0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535];e.exports=f}),a.define('/TypedNeuQuant.js',function(A,F,E,D){function C(A,B){function I(){o=[],q=new Int32Array(256),t=new Int32Array(a),y=new Int32Array(a),z=new Int32Array(a>>3);var c,d;for(c=0;c>=b,o[c][1]>>=b,o[c][2]>>=b,o[c][3]=c}function K(b,a,c,e,f){o[a][0]-=b*(o[a][0]-c)/d,o[a][1]-=b*(o[a][1]-e)/d,o[a][2]-=b*(o[a][2]-f)/d}function L(j,e,n,l,k){var h=Math.abs(e-j),i=Math.min(e+j,a),g=e+1,f=e-1,m=1,b,d;while(gh)d=z[m++],gh&&(b=o[f--],b[0]-=d*(b[0]-n)/c,b[1]-=d*(b[1]-l)/c,b[2]-=d*(b[2]-k)/c)}function C(p,s,q){var h=2147483647,k=h,d=-1,m=d,c,j,e,n,l;for(c=0;c>i-b),n>g,y[c]-=l,t[c]+=l<>1,b=f+1;b>1,b=f+1;b<256;b++)q[b]=n}function E(j,i,k){var b,d,c,e=1e3,h=-1,f=q[i],g=f-1;while(f=0)f=e?f=a:(f++,c<0&&(c=-c),b=d[0]-j,b<0&&(b=-b),c+=b,c=0&&(d=o[g],c=i-d[1],c>=e?g=-1:(g--,c<0&&(c=-c),b=d[0]-j,b<0&&(b=-b),c+=b,c>h;for(a<=1&&(a=0),c=0;c=f&&(g-=f),c++,q===0&&(q=1),c%q===0)for(n-=n/D,o-=o/v,a=o>>h,a<=1&&(a=0),e=0;e>g,r=e<>3,h=6,t=1< +
      +
      +
        +
        +
        + + +
        +
        +
        + +
        +
        +
        +
        +
        +
        \ No newline at end of file diff --git a/templates/frames-list.html b/templates/frames-list.html new file mode 100644 index 00000000..5312ecfd --- /dev/null +++ b/templates/frames-list.html @@ -0,0 +1,7 @@ +
        +
        + +
        +
        +
        +
        \ No newline at end of file diff --git a/templates/options.html b/templates/options.html new file mode 100644 index 00000000..afda7981 --- /dev/null +++ b/templates/options.html @@ -0,0 +1,11 @@ +
        +
        + +
        +
        + GIF +
        +
        + PNG +
        +
        \ No newline at end of file diff --git a/templates/preview.html b/templates/preview.html new file mode 100644 index 00000000..bab12e72 --- /dev/null +++ b/templates/preview.html @@ -0,0 +1,9 @@ +
        +
        +
        +
        +
        + 12 FPS + +
        +
        \ No newline at end of file diff --git a/templates/user-settings-drawer.html b/templates/user-settings-drawer.html new file mode 100644 index 00000000..83219bdf --- /dev/null +++ b/templates/user-settings-drawer.html @@ -0,0 +1,30 @@ +
        +
        +
        +
        + Canvas settings: +
        +
        + +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        +
        + +
        +
        +
        +
        + diff --git a/tests/integration/casperjs/smoke_test.js b/tests/integration/casperjs/smoke_test.js index bfb70ba2..c9782511 100644 --- a/tests/integration/casperjs/smoke_test.js +++ b/tests/integration/casperjs/smoke_test.js @@ -1,15 +1,15 @@ casper .start(casper.cli.get('baseUrl')+"?debug") .then(function () { - this.wait(3000); + this.wait(casper.cli.get('delay')); }) .then(function () { this.echo(casper.cli.get('baseUrl')+"?debug"); - // If there was a JS error after the page load, casper won't perform asserts + // If there was a JS error after the page load, casper won't perform asserts this.test.assertExists('html', 'Casper JS cannot assert DOM elements. A JS error has probably occured.'); this.test.assertExists('#drawing-canvas-container canvas', 'Check if drawing canvas element is created'); }) .run(function () { this.test.done(); - }); + }); \ No newline at end of file