mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Final fixes before new version

Browse Source
This commit is contained in:
jdescottes
2014-07-15 00:31:24 +02:00
parent a43b20e182
commit c1900a07f0
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/css/settings.css
View File

@@ -195,7 +195,8 @@
}
.save-status {
margin-bottom: 10px;
margin-top: 10px;
margin-bottom: -10px;
vertical-align: middle;
font-weight: normal;
text-shadow: none;

5
src/js/controller/settings/SaveController.js
View File

@@ -45,7 +45,8 @@
this.saveOnlineButton.hide();
$('.save-public-section').hide();
this.saveOnlineStatus.html(pskl.utils.Template.get('save-please-login-partial'));
this.saveFileButton.get(0).classList.add('button-primary');
} else {
this.saveOnlineStatus.html(pskl.utils.Template.get('save-online-status-partial'));
}
this.updateLocalStatusFilename_();
@@ -176,6 +177,6 @@
this.piskelName.classList.remove('piskel-name-saving');
}
window.setTimeout($.publish.bind($, Events.HIDE_NOTIFICATION), 2000);
window.setTimeout($.publish.bind($, Events.HIDE_NOTIFICATION), 5000);
};
})();

1
src/js/model/Frame.js
View File

@@ -8,7 +8,6 @@
this.id = __idCounter++;
this.version = 0;
this.pixels = ns.Frame.createEmptyPixelGrid_(width, height);
this.previousStates = [this.getPixels()];
this.stateIndex = 0;
} else {
throw 'Bad arguments in pskl.model.Frame constructor : ' + width + ', ' + height;

10
src/templates/settings/save.html
View File

@@ -17,18 +17,18 @@
</div>
<div class="settings-title">Save online</div>
<div class="settings-item">
<input type="button" class="button button-primary" id="save-online-button" value="Upload" />
<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>
<div class="settings-title">Save offline in Browser</div>
<div class="settings-item">
<div id="save-browser-status" class="save-status">Your piskel will be saved locally and will only be accessible from this browser.</div>
<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 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" id="save-file-button" value="Save as File" />
</div>
</form>
@@ -36,6 +36,10 @@
<span>Login to <a href="http://piskelapp.com" target="_blank">piskelapp.com</a> to save and share your sprites online !</span>
</script>
<script type="text/template" id="save-online-status-partial">
<span>Your piskel will be stored online in your gallery.</span>
</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>
</script>