X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/9b10c9eeb755d831eb0c6f047931af30d954f719..25400813a0ea9828e39975bf166672b97d3c16b7:/project/static/js/editor.ui.js?ds=sidebyside

diff --git a/project/static/js/editor.ui.js b/project/static/js/editor.ui.js
index aed04553..c8d47f66 100755
--- a/project/static/js/editor.ui.js
+++ b/project/static/js/editor.ui.js
@@ -2,116 +2,116 @@
  * UI related Editor methods
  */
 Editor.prototype.setupUI = function() {
-    // set up the UI visually and attach callbacks
+//     // set up the UI visually and attach callbacks
     var self = this;
-
-    var resize_start = function(event, mydata) {
-        $(document).bind('mousemove', mydata, resize_changed).
-        bind('mouseup', mydata, resize_stop);
-
-        $('.panel-overlay', mydata.root).css('display', 'block');
-        return false;
-    }
-    var resize_changed =  function(event) {
-        var old_width = parseInt(event.data.overlay.css('width'));
-        var delta = event.pageX + event.data.hotspot_x - old_width;
-
-        if(old_width + delta < 12) delta = 12 - old_width;
-        if(old_width + delta > $(window).width()) 
-            delta = $(window).width() - old_width;
-        
-        event.data.overlay.css({
-            'width': old_width + delta
-        });
-
-        if(event.data.overlay.next) {
-            var left = parseInt(event.data.overlay.next.css('left'));
-            event.data.overlay.next.css('left', left+delta);
-        }
-
-        return false;
-    };
-
-    var resize_stop = function(event) {
-        $(document).unbind('mousemove', resize_changed).unbind('mouseup', resize_stop);
-        // $('.panel-content', event.data.root).css('display', 'block');
-        var overlays = $('.panel-content-overlay', event.data.root);
-        $('.panel-content-overlay', event.data.root).each(function(i) {
-            if( $(this).data('panel').hasClass('last-panel') )
-                $(this).data('panel').css({
-                    'left': $(this).css('left'),
-                    'right': $(this).css('right')
-                });
-            else
-                $(this).data('panel').css({
-                    'left': $(this).css('left'),
-                    'width': $(this).css('width')
-                });
-        });
-        $('.panel-overlay', event.data.root).css('display', 'none');
-        $(event.data.root).trigger('stopResize');
-    };
-
-    /*
-     * Prepare panels (overlays & stuff)
-     */
-    /* create an overlay */
-    var panel_root = self.rootDiv;
-    var overlay_root = $("<div class='panel-overlay'></div>");
-    panel_root.append(overlay_root);
-
-    var prev = null;
-
-    $('*.panel-wrap', panel_root).each( function()
-    {
-        var panel = $(this);
-        var handle = $('.panel-slider', panel);
-        var overlay = $("<div class='panel-content-overlay panel-wrap'>&nbsp;</div>");
-        overlay_root.append(overlay);
-        overlay.data('panel', panel);
-        overlay.data('next', null);
-
-        if (prev) prev.next = overlay;
-
-        if( panel.hasClass('last-panel') )
-        {
-            overlay.css({
-                'left': panel.css('left'),
-                'right': panel.css('right')
-            });
-        }
-        else {
-            overlay.css({
-                'left': panel.css('left'),
-                'width': panel.css('width')
-            });
-            // $.log('Has handle: ' + panel.attr('id'));
-            overlay.append(handle.clone());
-            /* attach the trigger */
-            handle.mousedown(function(event) {
-                var touch_data = {
-                    root: panel_root,
-                    overlay: overlay,
-                    hotspot_x: event.pageX - handle.position().left
-                };
-
-                $(this).trigger('hpanel:panel-resize-start', touch_data);
-                return false;
-            });
-            $('.panel-content', panel).css('right',
-                (handle.outerWidth() || 10) + 'px');
-            $('.panel-content-overlay', panel).css('right',
-                (handle.outerWidth() || 10) + 'px');
-        };
-
-        prev = overlay;
-    });
-
-    panel_root.bind('hpanel:panel-resize-start', resize_start);
-    self.rootDiv.bind('stopResize', function() {
-        self.savePanelOptions();      
-    });
-    
+// 
+//     var resize_start = function(event, mydata) {
+//         $(document).bind('mousemove', mydata, resize_changed).
+//         bind('mouseup', mydata, resize_stop);
+// 
+//         $('.panel-overlay', mydata.root).css('display', 'block');
+//         return false;
+//     }
+//     var resize_changed =  function(event) {
+//         var old_width = parseInt(event.data.overlay.css('width'));
+//         var delta = event.pageX + event.data.hotspot_x - old_width;
+// 
+//         if(old_width + delta < 12) delta = 12 - old_width;
+//         if(old_width + delta > $(window).width()) 
+//             delta = $(window).width() - old_width;
+//         
+//         event.data.overlay.css({
+//             'width': old_width + delta
+//         });
+// 
+//         if(event.data.overlay.next) {
+//             var left = parseInt(event.data.overlay.next.css('left'));
+//             event.data.overlay.next.css('left', left+delta);
+//         }
+// 
+//         return false;
+//     };
+// 
+//     var resize_stop = function(event) {
+//         $(document).unbind('mousemove', resize_changed).unbind('mouseup', resize_stop);
+//         // $('.panel-content', event.data.root).css('display', 'block');
+//         var overlays = $('.panel-content-overlay', event.data.root);
+//         $('.panel-content-overlay', event.data.root).each(function(i) {
+//             if( $(this).data('panel').hasClass('last-panel') )
+//                 $(this).data('panel').css({
+//                     'left': $(this).css('left'),
+//                     'right': $(this).css('right')
+//                 });
+//             else
+//                 $(this).data('panel').css({
+//                     'left': $(this).css('left'),
+//                     'width': $(this).css('width')
+//                 });
+//         });
+//         $('.panel-overlay', event.data.root).css('display', 'none');
+//         $(event.data.root).trigger('stopResize');
+//     };
+// 
+//     /*
+//      * Prepare panels (overlays & stuff)
+//      */
+//     /* create an overlay */
+//     var panel_root = self.rootDiv;
+//     var overlay_root = $("<div class='panel-overlay'></div>");
+//     panel_root.append(overlay_root);
+// 
+//     var prev = null;
+// 
+//     $('*.panel-wrap', panel_root).each( function()
+//     {
+//         var panel = $(this);
+//         var handle = $('.panel-slider', panel);
+//         var overlay = $("<div class='panel-content-overlay panel-wrap'>&nbsp;</div>");
+//         overlay_root.append(overlay);
+//         overlay.data('panel', panel);
+//         overlay.data('next', null);
+// 
+//         if (prev) prev.next = overlay;
+// 
+//         if( panel.hasClass('last-panel') )
+//         {
+//             overlay.css({
+//                 'left': panel.css('left'),
+//                 'right': panel.css('right')
+//             });
+//         }
+//         else {
+//             overlay.css({
+//                 'left': panel.css('left'),
+//                 'width': panel.css('width')
+//             });
+//             // $.log('Has handle: ' + panel.attr('id'));
+//             overlay.append(handle.clone());
+//             /* attach the trigger */
+//             handle.mousedown(function(event) {
+//                 var touch_data = {
+//                     root: panel_root,
+//                     overlay: overlay,
+//                     hotspot_x: event.pageX - handle.position().left
+//                 };
+// 
+//                 $(this).trigger('hpanel:panel-resize-start', touch_data);
+//                 return false;
+//             });
+//             $('.panel-content', panel).css('right',
+//                 (handle.outerWidth() || 10) + 'px');
+//             $('.panel-content-overlay', panel).css('right',
+//                 (handle.outerWidth() || 10) + 'px');
+//         };
+// 
+//         prev = overlay;
+//     });
+// 
+//     panel_root.bind('hpanel:panel-resize-start', resize_start);
+//     self.rootDiv.bind('stopResize', function() {
+//         self.savePanelOptions();      
+//     });
+//     
     /*
      * Connect panel actions
      */
@@ -146,10 +146,14 @@ Editor.prototype.setupUI = function() {
      * Connect various buttons
      */
 
-    $('#toolbar-button-save').click( function (event, data) {
+    $('#toolbar-button-quick-save').click( function (event, data) {
         self.saveToBranch();
     } );
 
+    $('#toolbar-button-save').click( function (event, data) {
+        $('#commit-dialog').jqmShow( {callback: $.fbind(self, self.saveToBranch)} );
+    } );
+
     $('#toolbar-button-update').click( function (event, data) {
         if (self.updateUserBranch()) {
             // commit/update can be called only after proper, save
@@ -163,15 +167,34 @@ Editor.prototype.setupUI = function() {
     $('#commit-dialog').
     jqm({
         modal: true,
-        trigger: '#toolbar-button-commit'
+        onShow: $.fbind(self, self.loadRelatedIssues)        
     });
 
+    $('#toolbar-button-commit').click( function (event, data) {
+        $('#commit-dialog').jqmShow( {callback: $.fbind(self, self.sendMergeRequest)} );
+    } );
+    
+    /* STATIC BINDS */
     $('#commit-dialog-cancel-button').click(function() {
         $('#commit-dialog-error-empty-message').hide();
         $('#commit-dialog').jqmHide();
-    });
+    });   
+    
+
+    /* SPLIT DIALOG */
+    $('#split-dialog').jqm({
+        modal: true,
+        onShow: $.fbind(self, self.loadSplitDialog)
+    }).
+    jqmAddClose('button.dialog-close-button');
+}
 
-    $('#commit-dialog-save-button').click( function (event, data) 
+Editor.prototype.loadRelatedIssues = function(hash)
+{
+    var self = this;
+    var c = $('#commit-dialog-related-issues');
+
+    $('#commit-dialog-save-button').click( function (event, data)
     {
         if( $('#commit-dialog-message').val().match(/^\s*$/)) {
             $('#commit-dialog-error-empty-message').fadeIn();
@@ -179,20 +202,35 @@ Editor.prototype.setupUI = function() {
         else {
             $('#commit-dialog-error-empty-message').hide();
             $('#commit-dialog').jqmHide();
-            self.sendMergeRequest($('#commit-dialog-message').val() );
-        }       
-     
-        return false;
-    });    
 
-    /* SPLIT DIALOG */
-    $('#split-dialog').jqm({
-        modal: true,
-        onShow: $.fbind(self, self.loadSplitDialog)
-    }).
-    jqmAddClose('button.dialog-close-button');
+            var message = $('#commit-dialog-message').val();
+            $('#commit-dialog-related-issues input:checked').
+                each(function() { message += ' refs #' + $(this).val(); });
+            $.log("COMMIT APROVED", hash.t);
+            hash.t.callback(message);
+        }
+
+        return false;
+    });
 
-// $('#split-dialog').   
+    $("div.loading-box", c).show();
+    $("div.fatal-error-box", c).hide();
+    $("div.container-box", c).hide();
+    
+    $.getJSON( c.attr('ui:ajax-src') + '?callback=?',
+    function(data, status)
+    {
+        var fmt = '';
+        $(data).each( function() {
+            fmt += '<label><input type="checkbox" checked="checked"'
+            fmt += ' value="' + this.id + '" />' + this.subject +'</label>\n'
+        });
+        $("div.container-box", c).html(fmt);
+        $("div.loading-box", c).hide();
+        $("div.container-box", c).show();        
+    });   
+    
+    hash.w.show();
 }
 
 Editor.prototype.loadSplitDialog = function(hash)
@@ -237,7 +275,7 @@ Editor.prototype.loadSplitDialog = function(hash)
             hash.t.success();
         });
 
-        if($('#id_splitform-autoxml').is(':checked'))
+        /* if($('#id_splitform-autoxml').is(':checked'))
             $('#split-form-dc-subform').show();
         else
             $('#split-form-dc-subform').hide();
@@ -247,7 +285,7 @@ Editor.prototype.loadSplitDialog = function(hash)
                 $('#split-form-dc-subform').show();
             else
                 $('#split-form-dc-subform').hide();
-        });
+        }); */
     };   
 
     $.ajax({
@@ -273,9 +311,8 @@ Editor.prototype.refreshPanels = function() {
             panel.refresh();
     });
 
-    $('#toolbar-button-save').attr('disabled', 'disabled');
-    $('#toolbar-button-commit').removeAttr('disabled');
-    $('#toolbar-button-update').removeAttr('disabled');
+    $('button.provides-save').attr('disabled', 'disabled');
+    $('button.requires-save').removeAttr('disabled');
 };
 
 /*