From 5c9b069fe54f384bc3a1006c13b9e05dca4efb33 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Tue, 4 Oct 2011 17:43:13 +0100
Subject: [PATCH] Updated saving feedback to use loading.gif
---
apps/files_texteditor/css/style.css | 4 ++++
apps/files_texteditor/js/editor.js | 17 ++++-------------
core/img/loader.gif | Bin 0 -> 847 bytes
3 files changed, 8 insertions(+), 13 deletions(-)
create mode 100644 core/img/loader.gif
diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
index 2a9066839c..e94244d1be 100644
--- a/apps/files_texteditor/css/style.css
+++ b/apps/files_texteditor/css/style.css
@@ -22,4 +22,8 @@
#editor_save{
margin-left: 7px;
float: left;
+}
+#saving_icon{
+ padding-top: 3px;
+ float: left;
}
\ No newline at end of file
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 1823b5155a..73bc2f4111 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -55,14 +55,6 @@ function bindControlEvents(){
$('#editor_close').live('click',function() {
hideFileEditor();
});
-
- $(window).keypress(function(event) {
- if (!(event.which == 115 && (event.ctrlKey || event.metaKey)) && !(event.which == 19)) return true;
- event.preventDefault();
- alert("Saved file");
- doFileSave();
- return false;
- });
}
function editorIsShown(){
@@ -84,7 +76,7 @@ function updateSessionFileHash(path){
function doFileSave(){
if(editorIsShown()){
- $('#editor_save').val(t('files_texteditor','Saving')+'...');
+ $('#editor_save').after('<img id="saving_icon" src="'+OC.filePath('core','img','loading.gif')+'"></img>');
var filecontents = window.aceEditor.getSession().getValue();
var dir = $('#editor').attr('data-dir');
var file = $('#editor').attr('data-filename');
@@ -95,7 +87,7 @@ function doFileSave(){
if(answer){
$.post(OC.filePath('files_texteditor','ajax','savefile.php'),{ filecontents: filecontents, file: file, dir: dir, force: 'true' },function(jsondata){
if(jsondata.status =='success'){
- $('#editor_save').val(t('files_texteditor','Save'));
+ $('#saving_icon').remove();
}
else {
// Save error
@@ -105,13 +97,12 @@ function doFileSave(){
}
else {
// Don't save!
- $('#editor_save').effect("highlight", {color:'#FF5757'}, 3000);
- $('#editor_save').val(t('files_texteditor','Save'));
+ $('#editor_save').effect("highlight", {color:'#FF5757'}, 1000);
}
}
else if(jsondata.status == 'success'){
// Success
- $('#editor_save').val(t('files_texteditor','Save'));
+ $('#saving_icon').remove();
}
}, 'json');
giveEditorFocus();
diff --git a/core/img/loader.gif b/core/img/loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e192ca895cd00d6b752ec84619b787188f30ee41
GIT binary patch
literal 847
zcmZ?wbhEHb6krfw_`<;O|Nnmm28JI$eppyow6wIav9YPCsa?BvZN-WeVq#)tWo2n;
zX-}R!nK5I=v17+PJUqg}!Wc*aivPL&TtkAL9RpmA^bD9885kH8|4BI)r6!i7rYMwW
zmSiX-W+hhS<R_-+W#*;jGbsLK;pAdqV9){C0&*k+Yk-16UrOe@r3NB7idroRtJcmC
zIW|$swBZBW&5nlXUKSgs%+`R30<Dalt&95BXzDb0M*Uc%lJsGh$D|1sEh|jbWGgyN
zvlVQFMLt!^9(~{Mgw2u+1%)p6OFbD{Qb!-GSmB`JT6^HY!D~mEIC`cuq-KZ+@f<v$
z;2_B5bD-fva-e%Nlhc-`+X75yDA=qr4NVE$ru{-`-{SNs1}ntYEn3*`m@RN#*^z<U
zCcxZ)-G-B;!GJH4%|eTpvt3yco8<`#3Vq6-CurOf@zCNr5+K5<yQJOly>TO#mGfys
z?=2oJO%K^T^k%5s+*rxLA+Yb_8P*$F+<J}SE)IA2A{iDLcyNlf>KODnUE%7>7VvuZ
zmM7HSw49lxMkSj!Mw6eX8>^*3kYH_4n8IWza@1i(v$GuA8u4S<-A!{C6`h_W*fTV4
zXWBPG*|o`{$|*3SA$fQ1qB3qFrG*MF4=qk;Olac`bz3G`bVrhJX~ApF&uRY~uv!E1
zTT14<6%IVEh60C9O60~$9N#J7(Q~2gh6cMp7mEp#!gCEBiDhnzi5?6Q!814-b4{0Q
zWlVDM*uuuJYG-1S4p*OQLxHha@)6|?>OXkjD6yNEnFpw8Md&wZ^z^D=wKN{$w-p{D
zM;$npIhZgU+H}lO$#WvdhFJ>}IPCITSv?I@IwX4Kyv;Z9dg!np?9?r3)@o{Yl@bwH
va#;6b!itWB157^!3_Cd_HcWTu=W{mC;LtZ@Nn?%C?Cw!hWUvM$PcQ}m_Cf*>
literal 0
HcmV?d00001
--
GitLab