X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/0602376974810e6709409a69b010c5a68b5c3040..a947b4266b1e464b54d47a7acfbeccc504b9f663:/project/static/js/editor.js?ds=inline
diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index eb87f431..f6556578 100644
--- a/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@ -23,15 +23,14 @@ Panel.prototype.callHook = function() {
args = $.makeArray(arguments)
var hookName = args.splice(0,1)[0]
var noHookAction = args.splice(0,1)[0]
+ var result = false;
$.log('calling hook: ', hookName, 'with args: ', args);
if(this.hooks && this.hooks[hookName])
- {
- return this.hooks[hookName].apply(this, args);
- }
- else if (noHookAction instanceof Function)
- return noHookAction(args);
- else return false;
+ result = this.hooks[hookName].apply(this, args);
+ else if (noHookAction instanceof Function)
+ result = noHookAction(args);
+ return result;
}
Panel.prototype.load = function (url) {
@@ -52,6 +51,7 @@ Panel.prototype.load = function (url) {
},
error: function(request, textStatus, errorThrown) {
$.log('ajax', url, this.target, 'error:', textStatus, errorThrown);
+ $(self.contentDiv).html("<p>WystapiÅ bÅÄ
d podczas wczytywania panelu.");
}
});
}
@@ -69,9 +69,10 @@ Panel.prototype.unload = function(event, data) {
}
Panel.prototype.refresh = function(event, data) {
+ var self = this;
reload = function() {
- $.log('hard reload for panel ', this.current_url);
- this.load(this.current_url);
+ $.log('hard reload for panel ', self.current_url);
+ self.load(self.current_url);
return true;
}
@@ -86,8 +87,7 @@ Panel.prototype.otherPanelChanged = function(other) {
}
Panel.prototype.markChanged = function () {
- if(!this.wrap.hasClass('changed') ) // TODO: is this needed ?
- this.wrap.addClass('changed');
+ this.wrap.addClass('changed');
}
Panel.prototype.changed = function () {
@@ -107,21 +107,21 @@ Panel.prototype.saveInfo = function() {
function Editor() {
this.rootDiv = $('#panels');
+ this.popupQueue = [];
+ this.autosaveTimer = null;
}
Editor.prototype.setupUI = function() {
// set up the UI visually and attach callbacks
var self = this;
- $('*.panel-wrap:last', this.rootDiv).addClass('last-panel');
-
self.rootDiv.makeHorizPanel({}); // TODO: this probably doesn't belong into jQuery
- self.rootDiv.css('top', ($('#header').outerHeight() ) + 'px');
+ // self.rootDiv.css('top', ($('#header').outerHeight() ) + 'px');
$('#panels > *.panel-wrap').each(function() {
var panelWrap = $(this);
$.log('wrap: ', panelWrap);
- panel = new Panel(panelWrap);
+ var panel = new Panel(panelWrap);
panelWrap.data('ctrl', panel); // attach controllers to wraps
panel.load($('.panel-toolbar select', panelWrap).val());
@@ -130,13 +130,15 @@ Editor.prototype.setupUI = function() {
panelWrap.data('ctrl').load(url);
self.savePanelOptions();
});
+
+ $('.panel-toolbar button.refresh-button', panelWrap).click(
+ function() { panel.refresh(); } );
});
- $(document).bind('panel:contentChanged', function(event, data) {
- $('#toolbar-button-save').removeAttr('disabled');
- });
+ $(document).bind('panel:contentChanged', function() { self.onContentChanged.apply(self, arguments) });
$('#toolbar-button-save').click( function (event, data) { self.saveToBranch(); } );
+ $('#toolbar-button-commit').click( function (event, data) { self.sendPullRequest(); } );
self.rootDiv.bind('stopResize', function() { self.savePanelOptions() });
}
@@ -202,39 +204,76 @@ Editor.prototype.savePanelOptions = function() {
$.cookie('options', $.toJSON(self.options), { expires: 7, path: '/'});
}
-Editor.prototype.saveToBranch = function() {
+Editor.prototype.saveToBranch = function(msg)
+{
var changed_panel = $('.panel-wrap.changed');
var self = this;
$.log('Saving to local branch - panel:', changed_panel);
+ if(!msg) msg = "Zapis z edytora platformy.";
+
if( changed_panel.length == 0) {
$.log('Nothing to save.');
- return; /* no changes */
+ return true; /* no changes */
}
if( changed_panel.length > 1) {
alert('BÅÄ
d: wiÄcej niż jeden panel zostaÅ zmodyfikowany. Nie można zapisaÄ.');
- return;
+ return false;
}
saveInfo = changed_panel.data('ctrl').saveInfo();
+ var postData = ''
+
+ if(saveInfo.postData instanceof Object)
+ postData = $.param(saveInfo.postData);
+ else
+ postData = saveInfo.postData;
+
+ postData += '&' + $.param({'commit_message': msg})
$.ajax({
url: saveInfo.url,
dataType: 'json',
success: function(data, textStatus) {
if (data.result != 'ok')
- $.log('save errors: ', data.errors)
- else
+ self.showPopup('save-error', data.errors[0]);
+ else {
self.refreshPanels(changed_panel);
- $('#toolbar-button-save').attr('disabled', 'disabled');
+ $('#toolbar-button-save').attr('disabled', 'disabled');
+ $('#toolbar-button-commit').removeAttr('disabled');
+ if(self.autosaveTimer)
+ clearTimeout(self.autosaveTimer);
+
+ self.showPopup('save-successful');
+ }
},
error: function(rq, tstat, err) {
- $.log('save error', rq, tstat, err);
+ self.showPopup('save-error');
},
type: 'POST',
- data: saveInfo.postData
+ data: postData
});
+
+ return true;
+};
+
+Editor.prototype.autoSave = function()
+{
+ this.autosaveTimer = null;
+ // first check if there is anything to save
+ $.log('Autosave');
+ this.saveToBranch("Automatyczny zapis z edytora platformy.");
+}
+
+Editor.prototype.onContentChanged = function(event, data) {
+ var self = this;
+
+ $('#toolbar-button-save').removeAttr('disabled');
+ $('#toolbar-button-commit').attr('disabled', 'disabled');
+
+ if(this.autosaveTimer) return;
+ this.autosaveTimer = setTimeout( function() { self.autoSave(); }, 300000 );
};
Editor.prototype.refreshPanels = function(goodPanel) {
@@ -243,7 +282,7 @@ Editor.prototype.refreshPanels = function(goodPanel) {
panels.each(function() {
var panel = $(this).data('ctrl');
- $.log(this, panel);
+ $.log('Refreshing: ', this, panel);
if ( panel.changed() )
panel.unmarkChanged();
else
@@ -251,6 +290,61 @@ Editor.prototype.refreshPanels = function(goodPanel) {
});
};
+
+Editor.prototype.sendPullRequest = function () {
+ if( $('.panel-wrap.changed').length != 0)
+ alert("There are unsaved changes - can't make a pull request.");
+
+ this.showPopup('not-implemented');
+/*
+ $.ajax({
+ url: '/pull-request',
+ dataType: 'json',
+ success: function(data, textStatus) {
+ $.log('data: ' + data);
+ },
+ error: function(rq, tstat, err) {
+ $.log('commit error', rq, tstat, err);
+ },
+ type: 'POST',
+ data: {}
+ }); */
+}
+
+Editor.prototype.showPopup = function(name, text)
+{
+ var self = this;
+ self.popupQueue.push( [name, text] )
+
+ if( self.popupQueue.length > 1)
+ return;
+
+ var box = $('#message-box > #' + name);
+ $('*.data', box).html(text);
+ box.fadeIn();
+
+ self._nextPopup = function() {
+ var elem = self.popupQueue.pop()
+ if(elem) {
+ var box = $('#message-box > #' + elem[0]);
+
+ box.fadeOut(300, function() {
+ $('*.data', box).html();
+
+ if( self.popupQueue.length > 0) {
+ box = $('#message-box > #' + self.popupQueue[0][0]);
+ $('*.data', box).html(self.popupQueue[0][1]);
+ box.fadeIn();
+ setTimeout(self._nextPopup, 5000);
+ }
+ });
+ }
+ }
+
+ setTimeout(self._nextPopup, 5000);
+}
+
+
$(function() {
editor = new Editor();