Fix gif worker URL on IE11 appengine mode

This commit is contained in:
jdescottes 2014-07-13 14:02:35 +02:00
parent aa375315a2
commit cc8460cc26
6 changed files with 20 additions and 15 deletions

View file

@ -177,6 +177,7 @@ module.exports = function(grunt) {
{src: ['dest/js/piskel-packaged-min.js'], dest: 'dest/js/piskel-packaged-min' + version + '.js'},
{src: ['src/logo.png'], dest: 'dest/logo.png'},
{src: ['src/js/lib/iframeLoader-0.1.0.js'], dest: 'dest/js/lib/iframeLoader-0.1.0.js'},
{src: ['src/js/lib/gif/gif.ie.worker.js'], dest: 'dest/js/lib/gif/gif.ie.worker.js'},
{expand: true, src: ['img/**'], cwd: 'src/', dest: 'dest/', filter: 'isFile'},
{expand: true, src: ['css/fonts/**'], cwd: 'src/', dest: 'dest/', filter: 'isFile'},
{expand: true, src: ['**/*.html'], cwd: 'src/', dest: 'dest/', filter: 'isFile'}

View file

@ -18,11 +18,6 @@
max-width:32px;
}
.png-export-preview {
margin:10px 0;
overflow: hidden;
}
.png-export-preview img {
max-height:32px;
float: left;
@ -34,6 +29,11 @@
margin-top: 10px;
}
.gif-upload,
.png-export-preview {
overflow: hidden;
}
.gif-upload-status,
.gif-export-preview {
float : left;

View file

@ -11,10 +11,6 @@ body {
display: none;
}
.clearfix {
overflow: hidden;
}
.allow-user-select {
-webkit-touch-callout: initial;
-webkit-user-select: initial;

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,8 @@
(function () {
/**
* See @Gruntfile.js => after build, @@version is replaced by the build version
*/
var version = '@@version';
var versionHasNotBeenReplaced = version.indexOf('@@') === 0;
if (versionHasNotBeenReplaced) {

View file

@ -2,7 +2,7 @@
<div class="settings-title">
Export Spritesheet
</div>
<div class="png-export-preview"></div>
<div class="png-export-preview settings-item"></div>
<div class="settings-item">
<span class="settings-description">PNG with all frames side by side.</span>
<button type="button" class="button button-primary png-download-button">Download PNG</button>
@ -18,19 +18,19 @@
</div>
<div class="settings-item">
<form action="" method="POST" class="gif-export-form">
<div style="margin:10px 0;">
<div class="settings-item">
<label>Select resolution:</label>
<select class="gif-export-select-resolution"></select>
<script type="text/template" id="gif-export-option-template">
<option value="{{value}}">{{label}}</option>
</script>
</div>
<div style="margin:10px 0;">
<div class="settings-item">
<button type="button" class="button button-primary gif-download-button">Download GIF</button>
<button type="button" class="button button gif-upload-button">Get public URL</button>
</div>
</form>
<div class="clearfix">
<div class="gif-upload">
<div class="gif-export-preview"></div>
<div class="gif-upload-status"></div>
</div>