This commit is contained in:
jdescottes 2015-04-27 00:44:43 +02:00
parent 897bfd5ac9
commit 7b625bd10c
13 changed files with 30850 additions and 54 deletions

File diff suppressed because it is too large Load Diff

View File

@ -76,6 +76,7 @@
<iframe src="templates/cheatsheet.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="templates/misc-templates.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="templates/popup-preview.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<script type="text/javascript" src="piskel-boot.js"></script>
<!--body-main-end-->

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,86 @@
(function () {
/**
* See @Gruntfile.js => after build, -2015-04-27-12-01 is replaced by the build version
*/
var version = '-2015-04-27-12-01';
var versionHasNotBeenReplaced = version.indexOf('@@') === 0;
if (versionHasNotBeenReplaced) {
version = '';
}
window.onPiskelReady = function () {
var loadingMask = document.getElementById('loading-mask');
loadingMask.style.opacity = 0;
window.setTimeout(function () {loadingMask.parentNode.removeChild(loadingMask);}, 600);
pskl.app.init();
// cleanup
delete window.pskl_exports;
delete window.loadDebugScripts;
delete window.done;
};
var prefixPath = function (path) {
if (window.pskl && window.pskl.appEngineToken_) {
return '../' + path;
} else {
return path;
}
};
var loadScript = function (src, callback) {
src = prefixPath(src);
var script = window.document.createElement('script');
script.setAttribute('src',src);
script.setAttribute('onload',callback);
window.document.body.appendChild(script);
};
var loadStyle = function (src) {
src = prefixPath(src);
var link = document.createElement('link');
link.setAttribute('href', src);
link.setAttribute('rel', 'stylesheet');
link.setAttribute('type', 'text/css');
document.head.appendChild(link);
};
if (window.location.href.indexOf('debug') != -1) {
window.pskl_exports = {};
var scriptIndex = 0;
window.loadNextScript = function () {
if (scriptIndex == window.pskl_exports.scripts.length) {
window.onPiskelReady();
} else {
loadScript(window.pskl_exports.scripts[scriptIndex], 'loadNextScript()');
scriptIndex ++;
}
};
loadScript('piskel-script-list.js', 'loadNextScript()');
window.loadStyles = function () {
var styles = window.pskl_exports.styles;
for (var i = 0 ; i < styles.length ; i++) {
loadStyle(styles[i]);
}
};
loadScript('piskel-style-list.js', 'loadStyles()');
} else {
var script;
if (window.location.href.indexOf('pack') != -1) {
script = 'js/piskel-packaged' + version + '.js';
} else {
script = 'js/piskel-packaged-min' + version + '.js';
}
loadStyle('css/piskel-style-packaged' + version + '.css');
var loaderInterval = window.setInterval(function () {
if (document.querySelectorAll('[data-iframe-loader]').length === 0) {
window.clearInterval(loaderInterval);
loadScript(script, 'onPiskelReady()');
} else {
window.console.log('waiting for templates to load ....');
}
}, 100);
}
})();

View File

@ -1,9 +1,9 @@
(function () {
/**
* See @Gruntfile.js => after build, -2015-03-02-09-45 is replaced by the build version
* See @Gruntfile.js => after build, -2015-04-27-12-01 is replaced by the build version
*/
var version = '-2015-03-02-09-45';
var version = '-2015-04-27-12-01';
var versionHasNotBeenReplaced = version.indexOf('@@') === 0;
if (versionHasNotBeenReplaced) {
version = '';

View File

@ -1,10 +1,10 @@
<div id="main-wrapper" class="main-wrapper">
<iframe src="../templates-2015-03-02-09-45/drawing-tools.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-04-27-12-01/drawing-tools.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<div id="column-wrapper" class="column-wrapper">
<div class='column left-column'>
<iframe src="../templates-2015-03-02-09-45/frames-list.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-04-27-12-01/frames-list.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
</div>
<div class='column main-column'>
@ -14,24 +14,24 @@
</div>
<div class="column right-column">
<iframe src="../templates-2015-03-02-09-45/preview.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-03-02-09-45/layers-list.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-03-02-09-45/transformations.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-03-02-09-45/palettes-list.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-04-27-12-01/preview.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-04-27-12-01/layers-list.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-04-27-12-01/transformations.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-04-27-12-01/palettes-list.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<div class="pull-bottom cursor-coordinates"></div>
</div>
</div>
<div id="application-action-section" data-pskl-controller="settings" class="sticky-section right-sticky-section">
<div class="sticky-section-wrap">
<iframe src="../templates-2015-03-02-09-45/settings.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-04-27-12-01/settings.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<div class="drawer vertical-centerer">
<div class="drawer-content" id="drawer-container">
<iframe src="../templates-2015-03-02-09-45/settings/application.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-03-02-09-45/settings/resize.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-03-02-09-45/settings/save.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-03-02-09-45/settings/import.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-03-02-09-45/settings/export.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-04-27-12-01/settings/application.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-04-27-12-01/settings/resize.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-04-27-12-01/settings/save.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-04-27-12-01/settings/import.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-04-27-12-01/settings/export.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
</div>
</div>
</div>
@ -40,13 +40,14 @@
<div id="dialog-container-wrapper">
<div id="dialog-container">
<iframe src="../templates-2015-03-02-09-45/dialogs/create-palette.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-03-02-09-45/dialogs/import-image.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-03-02-09-45/dialogs/browse-local.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-04-27-12-01/dialogs/create-palette.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-04-27-12-01/dialogs/import-image.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
<iframe src="../templates-2015-04-27-12-01/dialogs/browse-local.html" onload="iframeloader.onLoad(event)" data-iframe-loader="store"></iframe>
</div>
</div>
<iframe src="../templates-2015-03-02-09-45/cheatsheet.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-03-02-09-45/misc-templates.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-04-27-12-01/cheatsheet.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-04-27-12-01/misc-templates.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<iframe src="../templates-2015-04-27-12-01/popup-preview.html" onload="iframeloader.onLoad(event)" data-iframe-loader="display"></iframe>
<script type="text/javascript" src="../piskel-boot-2015-03-02-09-45.js"></script>
<script type="text/javascript" src="../piskel-boot-2015-04-27-12-01.js"></script>

View File

@ -14,7 +14,9 @@
</div>
</div>
</div>
<span class="cheatsheet-link">Keyboard shortcuts</a>
<span
class="cheatsheet-link"
rel="tooltip" data-placement="right" title="Keyboard shortcuts">&nbsp;</span>
<script type="text/template" id="cheatsheet-shortcut-template">
<li class="cheatsheet-shortcut">
<div class="cheatsheet-icon {{shortcutIcon}}"></div>

View File

@ -0,0 +1,64 @@
<div style="display:none">
<script type="text/template" id="popup-preview-partial">
<style>
body,
.popup-container ,
.preview-container,
.tiled-frame-container {
width : 100%;
height : 100%;
}
body {
margin: 0;
}
.popup-container {
position: absolute;
background : #333;
}
.preview-container {
position: relative;
}
.tiled-frame-container {
position: relative;
background-repeat : no-repeat;
}
.canvas-container .canvas-background {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
.light-picker-background,
.light-canvas-background .canvas-background {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAAgCAMAAADdXFNzAAAABlBMVEXf39////8zI3BgAAAAHUlEQVR4AWNghAAGKGBE4w93eXTxkcYf2fE/Gv8A3C0B8ZfvECMAAAAASUVORK5CYII=) repeat;
}
.medium-picker-background,
.medium-canvas-background .canvas-background {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAF0AAABhCAMAAACDF10nAAAABlBMVEW6urr///82MBGFAAAAVElEQVR42u3UIRIAMAgEsfL/T9eAqajBnAiOgYncM1M9z7470+lhen3/lmc6PUtXArq+KwFd33WGru86Q9d3naHrO52u73S6vtPp+k6n6zudntD3CycwEZ5PT1TIAAAAAElFTkSuQmCC) repeat;
}
.lowcont-medium-picker-background,
.lowcont-medium-canvas-background .canvas-background {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAAAwCAMAAAC2edPQAAAACVBMVEXV1dXb29v///8dwgMCAAAAMElEQVR4AWNghAAGKGBE46Nzqap+VD0hdYzoXOqqH1U/MtPnaPofVT+a/kfT/6h6AMwdBGmkql8KAAAAAElFTkSuQmCC) repeat;
}
.lowcont-dark-picker-background,
.lowcont-dark-canvas-background .canvas-background {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAF0AAABhCAMAAACDF10nAAAACVBMVEVMTExVVVX///8WgdEBAAAAVElEQVR42u3UIRIAMAgEsfL/T9eAqajBnAiOgYncM1M9z7470+lhen3/lmc6PUtXArq+KwFd33WGru86Q9d3naHrO52u73S6vtPp+k6n6zudntD3CycwEZ5PT1TIAAAAAElFTkSuQmCC) repeat;
}
</style>
<div class="popup-container lowcont-dark-canvas-background ">
<div class="preview-container canvas-container">
<div class="canvas-background"></div>
</div>
</div>
</script>
</div>

View File

@ -2,7 +2,6 @@
<div class="settings-title">
Export Spritesheet
</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>
@ -26,10 +25,16 @@
<form action="" method="POST" class="gif-export-form">
<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}}" {{selected}}>{{label}}</option>
</script>
<div class="resize-section">
<span class="resize-section-title">Width</span>
<input type="text" class="textfield export-size-field export-gif-resize-width" name="resize-width"/>
<span>px</span>
</div>
<div class="resize-section">
<span class="resize-section-title">Height</span>
<input type="text" class="textfield export-size-field export-gif-resize-height" name="resize-height"/>
<span>px</span>
</div>
</div>
<div class="settings-item">
<button type="button" class="button button-primary gif-download-button">Download GIF</button>

View File

@ -1,5 +1,5 @@
<div class="settings-section">
<!-- RESIZE DRAWING AREA -->
<!-- RESIZE DRAWING SECTION -->
<div class="settings-title">
Resize
</div>
@ -44,4 +44,23 @@
<input type="submit" class="button button-primary resize-button" value="Resize" />
</form>
</div>
<!-- DEFAULT SIZE SECTION -->
<div class="settings-title">
Default size
</div>
<div class="settings-item settings-default-size">
<form action="" method="POST" name="default-size-form">
<div class="resize-section">
<span class="resize-section-title">Width</span>
<input type="text" class="textfield resize-size-field" name="default-width"/>
<span>px</span>
</div>
<div class="resize-section">
<span class="resize-section-title">Height</span>
<input type="text" class="textfield resize-size-field" name="default-height"/>
<span>px</span>
</div>
<input type="submit" class="button button-primary resize-button" value="Set default" />
</form>
</div>
</div>

View File

@ -1,13 +1,14 @@
<div class="settings-section setting-save-section">
<form action="" method="POST" name="save-form">
<form action="" method="POST" class="save-form" name="save-form">
<div class="settings-title">Describe your piskel</div>
<div class="settings-item">
<div class="settings-form-section" style="overflow:hidden">
<label class="row" style="float:left;line-height:28px;">Title : </label>
<input id="save-name" type="text" class="save-field textfield" style="float:left;width:198px;margin-left:10px;"/>
<label class="row" style="line-height:20px;">Title : </label>
<input id="save-name" type="text" class="save-field textfield"/>
</div>
<div class="settings-form-section">
<textarea id="save-description" class="save-field textfield" placeholder="Description ..."></textarea>
<label class="row" style="line-height:20px;">Description : </label>
<textarea id="save-description" class="save-field textfield"></textarea>
</div>
<div class="settings-form-section save-public-section">
<label class="row">
@ -15,22 +16,47 @@
</label>
</div>
</div>
</form>
<!-- PARTIALS -->
<!-- save-online-partial -->
<script type="text/template" id="save-online-partial">
<div class="settings-title">Save online</div>
<div class="settings-item">
<input type="button" class="button button-primary" id="save-online-button" value="Save to your gallery" />
<div id="save-online-status" class="save-status"></div>
</div>
</script>
<!-- save-localstorage-partial -->
<script type="text/template" id="save-localstorage-partial">
<div id="save-in-browser">
<div class="settings-title">Save offline in Browser</div>
<div class="settings-item">
<input type="button" class="button button-primary" id="save-browser-button" value="Save in Browser" />
<div id="save-browser-status" class="save-status">Your piskel will be saved locally and will only be accessible from this browser.</div>
</div>
</div>
</script>
<!-- save-file-partial -->
<script type="text/template" id="save-file-nw-partial">
<div class="settings-title">Save as File</div>
<div class="settings-item">
<input type="button" class="button button-primary" id="save-file-button" value="Save" />
<input type="button" class="button button-primary" id="save-as-button" value="Save as ..." />
<div id="save-file-status" class="save-status">Your sprite will be saved as a .piskel file.</div>
</div>
</script>
<script type="text/template" id="save-file-partial">
<div class="settings-title">Save offline as File</div>
<div class="settings-item">
<input type="button" class="button button-primary" id="save-file-button" value="Save as File" />
<div id="save-file-status" class="save-status"></div>
<input type="button" class="button button-primary" id="save-file-button" value="Save as .piskel" />
<div id="save-file-status" class="save-status">Your sprite will be downloaded as a .piskel file.</div>
</div>
</form>
</script>
<script type="text/template" id="save-please-login-partial">
<span>Login to <a href="http://piskelapp.com" target="_blank">piskelapp.com</a> to save and share your sprites online !</span>
@ -41,6 +67,10 @@
</script>
<script type="text/template" id="save-file-status-template">
<span>Your piskel will be downloaded as <span class="save-file-name">{{name}}<span></span>
<span>Your piskel will be downloaded as: <span class="save-file-name">{{name}}<span></span>
</script>
<script type="text/template" id="save-file-status-desktop-template">
<span>Saving as: <span class="save-desktop-file-name">{{name}}<span></span>
</script>
</div>