Fixed IE issues + verisoning for iframeloader and boot

This commit is contained in:
jdescottes 2014-07-06 17:15:18 +02:00
parent 8f5ead43d9
commit 707a69182f
9 changed files with 29 additions and 19 deletions

View File

@ -142,7 +142,7 @@ module.exports = function(grunt) {
]
},
files: [
{expand: true, flatten: true, src: ['src/piskel-boot.js'], dest: 'dest/'}
{expand: true, flatten: true, src: ['src/piskel-boot-0.1.0.js'], dest: 'dest/'}
]
},
index: {
@ -189,7 +189,7 @@ module.exports = function(grunt) {
files: [
{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.js'], dest: 'dest/js/lib/iframeLoader.js'},
{src: ['src/js/lib/iframeLoader-0.1.0.js'], dest: 'dest/js/lib/iframeLoader-0.1.0.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/templates/', dest: 'dest/templates' + version + '/', filter: 'isFile'}
@ -239,7 +239,7 @@ module.exports = function(grunt) {
},
src: [
'src/js/**/*.js',
'src/piskel-boot.js',
'src/piskel-boot-0.1.0.js',
'src/piskel-script-list.js',
'!src/js/lib/**/*.js'
],

View File

@ -96,6 +96,10 @@
border: #999 3px solid;
}
.tile-view {
position : relative;
}
.preview-tile .tile-overlay {
z-index: 10;
position: absolute;

View File

@ -22,7 +22,7 @@
color:white;">
<span style="top:45%">Loading Piskel ...</span>
</div>
<script type="text/javascript" src="js/lib/iframeLoader.js"></script>
<script type="text/javascript" src="js/lib/iframeLoader-0.1.0.js"></script>
<!-- the comment below indicates the beginning of markup reused by the editor integrated in piskelapp.com -->
<!-- do not delete, do not move :) -->
@ -78,6 +78,6 @@
<!-- the comment above indicates the end of the markup reused by the editor integrated in piskelapp.com -->
<!-- do not delete, do not move :) -->
<script type="text/javascript" src="piskel-boot.js"></script>
<script type="text/javascript" src="piskel-boot-0.1.0.js"></script>
</body>
</html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -4,6 +4,7 @@
ns.UserAgent = {
isIE : /MSIE/i.test( ua ),
isIE11 : /trident/i.test( ua ),
isChrome : /Chrome/i.test( ua ),
isFirefox : /Firefox/i.test( ua )
};

View File

@ -4,17 +4,6 @@
// Core libraries
"js/lib/jquery-1.8.0.js","js/lib/jquery-ui-1.10.3.custom.js","js/lib/pubsub.js","js/lib/bootstrap/bootstrap.js",
// GIF Encoding libraries
"js/lib/gif/gif.worker.js",
"js/lib/gif/gif.js",
"js/lib/gif/libgif.js",
// JSZip https://github.com/Stuk/jszip
"js/lib/jszip/jszip.min.js",
// Spectrum color-picker library
"js/lib/spectrum/spectrum.js",
// Application wide configuration
"js/Constants.js",
"js/Events.js",
@ -40,6 +29,17 @@
"js/utils/serialization/backward/Deserializer_v0.js",
"js/utils/serialization/backward/Deserializer_v1.js",
// GIF Encoding libraries
"js/lib/gif/gif.worker.js",
"js/lib/gif/gif.js",
"js/lib/gif/libgif.js",
// JSZip https://github.com/Stuk/jszip
"js/lib/jszip/jszip.min.js",
// Spectrum color-picker library
"js/lib/spectrum/spectrum.js",
// Application libraries-->
"js/rendering/DrawingLoop.js",