Dodanie middleware EditorSettings.

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

diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index 0f56fa7..c12182f 100644 (file)
--- 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]
     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])
 
        $.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) {
 }
 
 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);
                },
         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) {
 }
 
 Panel.prototype.refresh = function(event, data) {

+    var self = this;

     reload = function() {
     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;
     }
 
         return true;
     }
 


@@ -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,7 +116,7 @@ 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);
     
        $('#panels > *.panel-wrap').each(function() {
                var panelWrap = $(this);


@@ -129,11 +132,10 @@ Editor.prototype.setupUI = function() {
         });
     });
 
         });
     });
 

-       $(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-save').click( function (event, data) { self.saveToBranch(); } );

+    $('#toolbar-button-commit').click( function (event, data) { self.sendPullRequest(); } );

     self.rootDiv.bind('stopResize', function() { self.savePanelOptions() });
 }
 
     self.rootDiv.bind('stopResize', function() { self.savePanelOptions() });
 }
 


@@ -143,7 +145,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 {


@@ -195,26 +198,37 @@ 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,
 
        $.ajax({
                url: saveInfo.url,


@@ -222,16 +236,42 @@ Editor.prototype.saveToBranch = function() {
                success: function(data, textStatus) {
                        if (data.result != 'ok')
                                $.log('save errors: ', data.errors)
                success: function(data, textStatus) {
                        if (data.result != 'ok')
                                $.log('save errors: ', data.errors)

-                       else 
+                       else {

                                self.refreshPanels(changed_panel);
                                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) {
                },
                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) {
+        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) {
 };
 
 Editor.prototype.refreshPanels = function(goodPanel) {


@@ -240,7 +280,7 @@ Editor.prototype.refreshPanels = function(goodPanel) {
 
        panels.each(function() {
                var panel = $(this).data('ctrl');
 
        panels.each(function() {
                var panel = $(this).data('ctrl');

-               $.log(this, panel);
+               $.log('Refreshing: ', this, panel);

                if ( panel.changed() )
                        panel.unmarkChanged();
                else 
                if ( panel.changed() )
                        panel.unmarkChanged();
                else 


@@ -248,6 +288,54 @@ 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) 
+{
+    var self = this;
+    self.popupQueue.push(name)
+
+    if( self.popupQueue.length > 1) 
+        return;
+
+    $('#message-box > #' + name).fadeIn();
+ 
+   self._nextPopup = function() {
+        var elem = self.popupQueue.pop()
+        if(elem) {
+            elem = $('#message-box > #' + elem);
+            elem.fadeOut(300, function() {
+                if( self.popupQueue.length > 0) 
+                    $('#message-box > #' + self.popupQueue[0]).fadeIn();
+                    setTimeout(self._nextPopup, 1700);
+            });
+
+        }
+    }
+
+    setTimeout(self._nextPopup, 2000);
+}
+
+

 $(function() {
        editor = new Editor();
 
 $(function() {
        editor = new Editor();