Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma

[redakcja.git] / project / static / js / editor.js

diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index 7b14562..585f3ce 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.");

         }
     });
 }
         }
     });
 }


@@ -106,6 +107,8 @@ Panel.prototype.saveInfo = function() {
 
 function Editor() {
        this.rootDiv = $('#panels');
 
 function Editor() {
        this.rootDiv = $('#panels');

+    this.popupQueue = [];
+    this.autosaveTimer = null;

 }
 
 Editor.prototype.setupUI = function() {
 }
 
 Editor.prototype.setupUI = function() {


@@ -113,12 +116,12 @@ Editor.prototype.setupUI = function() {
        var self = this;
    
        self.rootDiv.makeHorizPanel({}); // TODO: this probably doesn't belong into jQuery
        var self = this;
    
        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);
     
        $('#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());
         
                panelWrap.data('ctrl', panel); // attach controllers to wraps
         panel.load($('.panel-toolbar select', panelWrap).val());
         


@@ -127,6 +130,9 @@ Editor.prototype.setupUI = function() {
             panelWrap.data('ctrl').load(url);
             self.savePanelOptions();
         });
             panelWrap.data('ctrl').load(url);
             self.savePanelOptions();
         });

+
+        $('.panel-toolbar button.refresh-button', panelWrap).click(
+            function() { panel.refresh(); } );            

     });
 
        $(document).bind('panel:contentChanged', function() { self.onContentChanged.apply(self, arguments) });
     });
 
        $(document).bind('panel:contentChanged', function() { self.onContentChanged.apply(self, arguments) });


@@ -142,7 +148,8 @@ Editor.prototype.loadConfig = function() {
         panels: [
             {name: 'htmleditor', ratio: 0.5},
             {name: 'gallery', ratio: 0.5}
         panels: [
             {name: 'htmleditor', ratio: 0.5},
             {name: 'gallery', ratio: 0.5}

-        ]
+        ],
+        lastUpdate: 0,

     }
     
     try {
     }
     
     try {


@@ -194,50 +201,81 @@ Editor.prototype.savePanelOptions = function() {
         })
     });
     self.options.panels = panels;
         })
     });
     self.options.panels = panels;

+    self.options.lastUpdate = (new Date()).getTime() / 1000;

     $.log($.toJSON(self.options));
     $.cookie('options', $.toJSON(self.options), { expires: 7, path: '/'});
 }
 
     $.log($.toJSON(self.options));
     $.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);
 
        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.');
        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ć.');
        }
 
        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();
        }
 
        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')
 
        $.ajax({
                url: saveInfo.url,
                dataType: 'json',
                success: function(data, textStatus) {
                        if (data.result != 'ok')

-                               $.log('save errors: ', data.errors)
+                               self.showPopup('save-error', data.errors[0]);

                        else {
                                self.refreshPanels(changed_panel);
                 $('#toolbar-button-save').attr('disabled', 'disabled');
                 $('#toolbar-button-commit').removeAttr('disabled');
                        else {
                                self.refreshPanels(changed_panel);
                 $('#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) {
             }
                },
                error: function(rq, tstat, err) {

-                       $.log('save error', rq, tstat, err);
+            self.showPopup('save-error');

                },
                type: 'POST',
                },
                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) {
 Editor.prototype.onContentChanged = function(event, data) {

+        var self = this;
+

         $('#toolbar-button-save').removeAttr('disabled');
         $('#toolbar-button-commit').attr('disabled', 'disabled');
         $('#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) {
 };
 
 Editor.prototype.refreshPanels = function(goodPanel) {


@@ -256,9 +294,11 @@ Editor.prototype.refreshPanels = function(goodPanel) {
 
 
 Editor.prototype.sendPullRequest = function () {
 
 
 Editor.prototype.sendPullRequest = function () {

-    if( $('.panel-wrap.changed').length != 0)
+    if( $('.panel-wrap.changed').length != 0)        

         alert("There are unsaved changes - can't make a pull request.");
 
         alert("There are unsaved changes - can't make a pull request.");
 

+    this.showPopup('not-implemented');
+/*

        $.ajax({
                url: '/pull-request',
                dataType: 'json',
        $.ajax({
                url: '/pull-request',
                dataType: 'json',


@@ -270,9 +310,43 @@ Editor.prototype.sendPullRequest = function () {
                },
                type: 'POST',
                data: {}
                },
                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();
 
 $(function() {
        editor = new Editor();