diff --git a/.gitignore b/.gitignore index 773d18d..c86ccd4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ lib/tests/pid.txt comicbook node_modules +lib/templates.js diff --git a/.travis.yml b/.travis.yml index 6e5919d..d747cad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ language: node_js node_js: - "0.10" +before_script: + - make diff --git a/Makefile b/Makefile index 19c16fd..a4b4c76 100755 --- a/Makefile +++ b/Makefile @@ -47,3 +47,4 @@ test: clean: @rm -r comicbook @rm -r examples/comicbook + @rm lib/templates.js diff --git a/css/toolbar.css b/css/toolbar.css index 941a9ad..26b655b 100644 --- a/css/toolbar.css +++ b/css/toolbar.css @@ -64,6 +64,10 @@ button, input, label { padding: 0 12px; } +.mobile .toolbar li > button { + padding: 0 9px; +} + .toolbar li > button:hover { color: #8CC746; } diff --git a/examples/basic.html b/examples/basic.html index 2d60f27..d4eda34 100755 --- a/examples/basic.html +++ b/examples/basic.html @@ -45,7 +45,7 @@ 'goldenboy/goldenboy_24.jpg', 'goldenboy/goldenboy_25.jpg' ], { - libPath: "/reader/examples/comicbook/js/" + libPath: "/HTML5-Comic-Book-Reader/examples/comicbook/js/" }); book.draw(); diff --git a/examples/dev.html b/examples/dev.html index 4cfaf1a..a4d3b84 100755 --- a/examples/dev.html +++ b/examples/dev.html @@ -55,7 +55,7 @@ 'goldenboy/goldenboy_24.jpg', 'goldenboy/goldenboy_25.jpg' ], { - libPath: "/reader/examples/comicbook/js/" + libPath: "/HTML5-Comic-Book-Reader/examples/comicbook/js/" }); book.draw(); diff --git a/examples/file.html b/examples/file.html index 71921de..ed42770 100644 --- a/examples/file.html +++ b/examples/file.html @@ -99,7 +99,7 @@ fr.onload = function () { var done = false; - var ua = new bitjs.archive[archive_class](this.result, '/cbr/lib/bitjs/'); + var ua = new bitjs.archive[archive_class](this.result, '/HTML5-Comic-Book-Reader/examples/bitjs/'); ua.addEventListener(bitjs.archive.UnarchiveEvent.Type.EXTRACT, function (e) { @@ -170,7 +170,7 @@ var name = this.file.name.replace(/\.[a-z]+$/, ''); var id = encodeURIComponent(name.toLowerCase()); - var book = new ComicBook('comic', pages, { libPath: '/reader/examples/comicbook/js/'}); + var book = new ComicBook('comic', pages, { libPath: '/HTML5-Comic-Book-Reader/examples/comicbook/js/'}); document.title = name; diff --git a/fonts/icomoon-toolbar/Read Me.txt b/fonts/icomoon-toolbar/Read Me.txt old mode 100755 new mode 100644 diff --git a/fonts/icomoon-toolbar/fonts/toolbar.dev.svg b/fonts/icomoon-toolbar/fonts/toolbar.dev.svg old mode 100755 new mode 100644 index a7323d5..20962b3 --- a/fonts/icomoon-toolbar/fonts/toolbar.dev.svg +++ b/fonts/icomoon-toolbar/fonts/toolbar.dev.svg @@ -9,100 +9,102 @@ This is a custom SVG font generated by IcoMoon. - + - - + + - + - - - - + z M 240,208c-88.365,0-160,71.635-160,160S 151.635,528, 240,528s 160-71.635, 160-160S 328.366,208, 240,208zM 280,488L 200,488L 200,408L 120,408L 120,328L 200,328L 200,248L 280,248L 280,328L 360,328L 360,408L 280,408 z" data-tags="zoom in, enlarge, scale" /> + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + c-0.022-1.35-0.035-2.702-0.035-4.060c0-1.48, 0.018-2.951, 0.044-4.424c 0.003-0.122, 0.004-0.244, 0.009-0.366 + C 82.602,72.874, 189.051-32, 320-32c 130.947,0, 237.395,104.874, 239.949,235.21c 0.003,0.122, 0.005,0.245, 0.006,0.366 + c 0.026,1.472, 0.045,2.946, 0.045,4.424C 560,209.358, 559.985,210.71, 559.963,212.061z M 479.969,205.038l-0.005-0.254 + c-0.824-42.054-17.832-81.459-47.891-110.968C 401.984,64.271, 362.179,48, 320,48c-7.789,0-15.496,0.559-23.078,1.649 + c 86.91,51.779, 145.135,146.69, 145.135,255.201c0,12.16-0.737,24.146-2.157,35.925c 25.17-46.212, 38.79-89.25, 40.001-127.266 + l 0.003-0.090c 0.020-0.593, 0.033-1.182, 0.049-1.777l 0.018-0.905C 479.988,209.826, 480,208.913, 480,208 + C 480,207.010, 479.988,206.024, 479.969,205.038z" data-tags="droplet, colors, water" /> + + + + + - \ No newline at end of file diff --git a/fonts/icomoon-toolbar/fonts/toolbar.eot b/fonts/icomoon-toolbar/fonts/toolbar.eot old mode 100755 new mode 100644 index 5720002..be978c4 Binary files a/fonts/icomoon-toolbar/fonts/toolbar.eot and b/fonts/icomoon-toolbar/fonts/toolbar.eot differ diff --git a/fonts/icomoon-toolbar/fonts/toolbar.svg b/fonts/icomoon-toolbar/fonts/toolbar.svg old mode 100755 new mode 100644 index 7003f7d..9fafa5c --- a/fonts/icomoon-toolbar/fonts/toolbar.svg +++ b/fonts/icomoon-toolbar/fonts/toolbar.svg @@ -9,100 +9,102 @@ This is a custom SVG font generated by IcoMoon. - + - - + + - + - - - - + z M 240,208c-88.365,0-160,71.635-160,160S 151.635,528, 240,528s 160-71.635, 160-160S 328.366,208, 240,208zM 280,488L 200,488L 200,408L 120,408L 120,328L 200,328L 200,248L 280,248L 280,328L 360,328L 360,408L 280,408 z" /> + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + c-0.022-1.35-0.035-2.702-0.035-4.060c0-1.48, 0.018-2.951, 0.044-4.424c 0.003-0.122, 0.004-0.244, 0.009-0.366 + C 82.602,72.874, 189.051-32, 320-32c 130.947,0, 237.395,104.874, 239.949,235.21c 0.003,0.122, 0.005,0.245, 0.006,0.366 + c 0.026,1.472, 0.045,2.946, 0.045,4.424C 560,209.358, 559.985,210.71, 559.963,212.061z M 479.969,205.038l-0.005-0.254 + c-0.824-42.054-17.832-81.459-47.891-110.968C 401.984,64.271, 362.179,48, 320,48c-7.789,0-15.496,0.559-23.078,1.649 + c 86.91,51.779, 145.135,146.69, 145.135,255.201c0,12.16-0.737,24.146-2.157,35.925c 25.17-46.212, 38.79-89.25, 40.001-127.266 + l 0.003-0.090c 0.020-0.593, 0.033-1.182, 0.049-1.777l 0.018-0.905C 479.988,209.826, 480,208.913, 480,208 + C 480,207.010, 479.988,206.024, 479.969,205.038z" /> + + + + + - \ No newline at end of file diff --git a/fonts/icomoon-toolbar/fonts/toolbar.ttf b/fonts/icomoon-toolbar/fonts/toolbar.ttf old mode 100755 new mode 100644 index a33dff1..6bf7291 Binary files a/fonts/icomoon-toolbar/fonts/toolbar.ttf and b/fonts/icomoon-toolbar/fonts/toolbar.ttf differ diff --git a/fonts/icomoon-toolbar/fonts/toolbar.woff b/fonts/icomoon-toolbar/fonts/toolbar.woff old mode 100755 new mode 100644 index 6030af5..2722452 Binary files a/fonts/icomoon-toolbar/fonts/toolbar.woff and b/fonts/icomoon-toolbar/fonts/toolbar.woff differ diff --git a/fonts/icomoon-toolbar/index.html b/fonts/icomoon-toolbar/index.html old mode 100755 new mode 100644 index 5eb6a21..97bb1a5 --- a/fonts/icomoon-toolbar/index.html +++ b/fonts/icomoon-toolbar/index.html @@ -204,6 +204,10 @@ +
+ + +
@@ -326,6 +330,10 @@  icon-remove + + +  icon-copy +