fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uprawnienia do dodawania plikow.
[redakcja.git]
/
project
/
static
/
js
/
editor.js
diff --git
a/project/static/js/editor.js
b/project/static/js/editor.js
index
a3d9659
..
6e63eb0
100644
(file)
--- a/
project/static/js/editor.js
+++ b/
project/static/js/editor.js
@@
-51,6
+51,7
@@
Panel.prototype.load = function (url) {
},
error: function(request, textStatus, errorThrown) {
$.log('ajax', url, this.target, 'error:', textStatus, errorThrown);
},
error: function(request, textStatus, errorThrown) {
$.log('ajax', url, this.target, 'error:', textStatus, errorThrown);
+ $(self.contentDiv).html("<p>Wystapił błąd podczas wczytywania panelu.");
}
});
}
}
});
}
@@
-206,7
+207,7
@@
Editor.prototype.saveToBranch = function(msg)
var self = this;
$.log('Saving to local branch - panel:', changed_panel);
var self = this;
$.log('Saving to local branch - panel:', changed_panel);
- if(!msg) msg = "Zapis z edytora platformy.";
+
if(!msg) msg = "Zapis z edytora platformy.";
if( changed_panel.length == 0) {
$.log('Nothing to save.');
if( changed_panel.length == 0) {
$.log('Nothing to save.');
@@
-219,7
+220,13
@@
Editor.prototype.saveToBranch = function(msg)
}
saveInfo = changed_panel.data('ctrl').saveInfo();
}
saveInfo = changed_panel.data('ctrl').saveInfo();
- $.extend(saveInfo.postData, {'commit_message': msg});
+ var postData = ''
+ if(saveInfo.postData instanceof Object)
+ postData = $.param(saveInfo.postData);
+ else
+ postData = saveInfo.postData;
+
+ postData += '&' + $.param({'commit_message': msg})
$.ajax({
url: saveInfo.url,
$.ajax({
url: saveInfo.url,
@@
-241,7
+248,7
@@
Editor.prototype.saveToBranch = function(msg)
self.showPopup('save-error');
},
type: 'POST',
self.showPopup('save-error');
},
type: 'POST',
- data:
saveInfo.
postData
+ data: postData
});
return true;
});
return true;
@@
-262,7
+269,7
@@
Editor.prototype.onContentChanged = function(event, data) {
$('#toolbar-button-commit').attr('disabled', 'disabled');
if(this.autosaveTimer) return;
$('#toolbar-button-commit').attr('disabled', 'disabled');
if(this.autosaveTimer) return;
- this.autosaveTimer = setTimeout( function() { self.autoSave(); },
5
000 );
+ this.autosaveTimer = setTimeout( function() { self.autoSave(); },
300
000 );
};
Editor.prototype.refreshPanels = function(goodPanel) {
};
Editor.prototype.refreshPanels = function(goodPanel) {