X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/6da03c3c5f257a0123cd283469459668fd653fe4..404423b9a4cbc22700fdf1f76b65973af374c378:/platforma/static/js/main.js?ds=sidebyside

diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index 284fd197..89ffeafb 100644
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -1,63 +1,10 @@
-function serialize(element) {
-    if (element.nodeType == 3) { // tekst
-        return [$.trim(element.nodeValue)];
-    } else if (element.nodeType != 1) { // pomijamy węzły nie będące elementami XML ani tekstem
-        return [];
+if (!window.console) {
+    window.console = {
+        log: function() {}
     }
-    
-    var result = [];
-    var hasContent = false;
-    
-    result.push('<');
-    result.push(element.tagName);
-    
-    // Mozilla nie uważa deklaracji namespace za atrybuty
-    var ns = element.tagName.indexOf(':');
-    if (ns != -1 && $.browser.mozilla) {
-        result.push(' xmlns:');
-        result.push(element.tagName.substring(0, ns));
-        result.push('="');
-        result.push(element.namespaceURI);
-        result.push('"');
-    }
-    
-    if (element.attributes) {
-        for (var i=0; i < element.attributes.length; i++) {
-            var attr = element.attributes[i];
-            result.push(' ');
-            result.push(attr.name);
-            result.push('="');
-            result.push(attr.value);
-            result.push('"');
-            hasContent = true;
-        }
-    }
-    
-    if (element.childNodes.length == 0) {
-        result.push(' />');
-    } else {
-        result.push('>');
-
-        for (var i=0; i < element.childNodes.length; i++) {
-            result = result.concat(serialize(element.childNodes[i]));
-        }
-
-        result.push('</');
-        result.push(element.tagName);
-        result.push('>');
-    }
-    
-    if (element.tagName == 'akap' || element.tagName == 'akap_dialog' || element.tagName == 'akap_cd') {
-        result.push('\n\n\n');
-    } else if (element.tagName == 'rdf:RDF') {
-        result.push('\n\n\n\n\n');
-    } else if (element.tagName.indexOf('dc:') != -1) {
-        result.push('\n');
-    }
-    
-    return result;
-};
+}
 
+// Teraz nieużywane
 function highlight(colour) {
     var range, sel;
     if (window.getSelection) {
@@ -83,27 +30,6 @@ function highlight(colour) {
     }
 }
 
-function selectTheme(themeId)
-{
-    var selection = window.getSelection();
-    
-    // remove current selection
-    selection.removeAllRanges();
-
-    var range = document.createRange();
-    var s = $(".motyw[theme-class='"+themeId+"']")[0];
-    var e = $(".end[theme-class='"+themeId+"']")[0];
-    // console.log('Selecting range:', themeId, range, s, e);
-    
-    if(s && e) {
-        range.setStartAfter(s);
-        range.setEndBefore(e);
-        selection.addRange(range);
-        // highlight('yellow');
-        // selection.removeAllRanges();
-    }
-};
-
 // function unselectThemes(themeId) {
 //     $('.Apple-style-span').each(function() {
 //         $(this).after($(this).html());
@@ -111,11 +37,563 @@ function selectTheme(themeId)
 //     });
 // }
 
+function gallery(element, url) {    
+    var element = $(element);
+    var imageDimensions = {};
+    element.data('images', []);
+    
+    function changePage(pageNumber) {        
+        $('img', element).attr('src', element.data('images')[pageNumber - 1]);
+    }
+    
+    function normalizeNumber(pageNumber) {
+        // Numer strony musi być pomiędzy 1 a najwyższym numerem
+        var pageCount = element.data('images').length;
+        pageNumber = parseInt(pageNumber, 10);
+        
+        if (!pageNumber || pageNumber == NaN || pageNumber == Infinity || pageNumber == -Infinity) {
+            return 1;
+        } else if (pageNumber < 1) {
+            return 1;
+        } else if (pageNumber > pageCount) {
+            return pageCount;
+        } else {
+            return pageNumber;
+        }
+    }
+    
+    var pn = $('.page-number', element);
+    pn.change(function(event) {
+        event.preventDefault();
+        var n = normalizeNumber(pn.val());
+        pn.val(n);
+        changePage(n);
+    });
+    $('.previous-page', element).click(function() {
+        pn.val(normalizeNumber(pn.val()) - 1);
+        pn.change();
+    });
+    $('.next-page', element).click(function() {
+        pn.val(normalizeNumber(pn.val()) + 1);
+        pn.change();
+    });
+    
+    
+    var image = $('img', element).attr('unselectable', 'on');
+    var origin = {};
+    var imageOrigin = {};
+    var zoomFactor = 1;
+    
+    $('.zoom-in', element).click(function() {
+        zoomFactor = Math.min(2, zoomFactor + 0.2);
+        zoom();
+    });
+    $('.zoom-out', element).click(function() {
+        zoomFactor = Math.max(0.2, zoomFactor - 0.2);
+        zoom();
+    });
+    $('.change-gallery', element).click(function() {
+        $('.chosen-gallery').val($('#document-meta .gallery').html() || '/platforma/gallery/');
+        $('.gallery-image').animate({top: 53}, 200);
+        $('.chosen-gallery').focus();
+    });
+    $('.change-gallery-ok', element).click(function() {
+        if ($('#document-meta .gallery').length == 0) {
+            $('<div class="gallery"></div>').appendTo('#document-meta');
+        }
+        $('#document-meta .gallery').html($('.chosen-gallery').val());
+        updateGallery($('.chosen-gallery').val());
+        $('.gallery-image').animate({top: 27}, 200);
+    });
+    $('.change-gallery-cancel', element).click(function() {
+        $('.gallery-image').animate({top: 27}, 200);
+    });
+    
+    $('img', element).load(function() {
+        image.css({width: null, height: null});
+        imageDimensions = {
+            width: $(this).width() * zoomFactor,
+            height: $(this).height() * zoomFactor,
+            originWidth: $(this).width(),
+            originHeight: $(this).height(),
+            galleryWidth: $(this).parent().width(),
+            galleryHeight: $(this).parent().height()
+        };
+        
+        if (!(imageDimensions.width && imageDimensions.height)) {
+            setTimeout(function() { $('img', element).load(); }, 100);
+        }        
+        var position = normalizePosition(
+            image.position().left,
+            image.position().top, 
+            imageDimensions.galleryWidth,
+            imageDimensions.galleryHeight,
+            imageDimensions.width,
+            imageDimensions.height
+        );
+        image.css({left: position.x, top: position.y, width: $(this).width() * zoomFactor, height: $(this).height() * zoomFactor});
+    });
+
+    $(window).resize(function() {
+        imageDimensions.galleryWidth = image.parent().width();
+        imageDimensions.galleryHeight = image.parent().height();
+    });
+    
+    function bounds(galleryWidth, galleryHeight, imageWidth, imageHeight) {
+        return {
+            maxX: 0,
+            maxY: 0,
+            minX: galleryWidth - imageWidth,
+            minY: galleryHeight - imageHeight
+        }
+    }
+    
+    function normalizePosition(x, y, galleryWidth, galleryHeight, imageWidth, imageHeight) {
+        var b = bounds(galleryWidth, galleryHeight, imageWidth, imageHeight);
+        return {
+            x: Math.min(b.maxX, Math.max(b.minX, x)),
+            y: Math.min(b.maxY, Math.max(b.minY, y))
+        }
+    }
+    
+    function onMouseMove(event) {
+        var position = normalizePosition(
+            event.clientX - origin.x + imageOrigin.left,
+            event.clientY - origin.y + imageOrigin.top, 
+            imageDimensions.galleryWidth,
+            imageDimensions.galleryHeight,
+            imageDimensions.width,
+            imageDimensions.height
+        );
+        image.css({position: 'absolute', top: position.y, left: position.x});
+        return false;
+    }
+    
+    function setZoom(factor) {
+        zoomFactor = factor;
+    }
+    
+    function zoom() {
+        imageDimensions.width = imageDimensions.originWidth * zoomFactor;
+        imageDimensions.height = imageDimensions.originHeight * zoomFactor;
+        var position = normalizePosition(
+            image.position().left,
+            image.position().top, 
+            imageDimensions.galleryWidth,
+            imageDimensions.galleryHeight,
+            imageDimensions.width,
+            imageDimensions.height
+        );
+        image.css({width: imageDimensions.width, height: imageDimensions.height,
+            left: position.x, top: position.y});
+
+    }
+    
+    function onMouseUp(event) {
+        $(document)
+            .unbind('mousemove.gallery')
+            .unbind('mouseup.gallery');
+        return false;
+    }
+    
+    image.bind('mousedown', function(event) {
+        origin = {
+            x: event.clientX,
+            y: event.clientY
+        };
+        imageOrigin = image.position();
+        $(document)
+            .bind('mousemove.gallery', onMouseMove)
+            .bind('mouseup.gallery', onMouseUp);
+        return false;
+    });
+    
+    function updateGallery(url) {
+        $.ajax({
+            url: url,
+            type: 'GET',
+            dataType: 'json',
+
+            success: function(data) {
+                element.data('images', data);
+                pn.val(1);
+                pn.change();
+                $('img', element).show();
+            },
+            
+            error: function(data) {
+                element.data('images', []);
+                pn.val(1);
+                pn.change();
+                $('img', element).hide();
+            }
+        });
+    }
+    
+    if (url) {
+        updateGallery(url);
+    }
+}
+
+
+function transform(editor) {
+    $.blockUI({message: 'Ładowanie...'});
+    setTimeout(function() {
+        xml2html({
+            xml: editor.getCode(),
+            success: function(element) {
+                $('#html-view').html(element);
+                $.unblockUI();
+            }, error: function(text) {
+                $('#html-view').html('<p class="error">Wystąpił błąd:</p><pre>' + text + '</pre>');
+                $.unblockUI();
+            }
+        });
+    }, 200);
+};
+
+
+function reverseTransform(editor, cont) {
+    var serializer = new XMLSerializer();
+    if ($('#html-view .error').length > 0) {
+        return;
+    }
+    $.blockUI({message: 'Ładowanie...'});
+    setTimeout(function() {
+        html2xml({
+            xml: serializer.serializeToString($('#html-view div').get(0)),
+            success: function(text) {
+                editor.setCode(text);
+                $.unblockUI();
+                if (cont) {
+                    cont();
+                }
+            }, error: function(text) {
+                $('#source-editor').html('<p>Wystąpił błąd:</p><pre>' + text + '</pre>');
+                $.unblockUI();
+            }
+        });
+    }, 200);
+}
+
+
+// =============
+// = HTML View =
+// =============
+function html(element) {
+    var element = $(element);
+    
+    function selectTheme(themeId)
+    {
+        var selection = window.getSelection();
+        selection.removeAllRanges();
+
+        var range = document.createRange();
+        var s = $(".motyw[theme-class='"+themeId+"']")[0];
+        var e = $(".end[theme-class='"+themeId+"']")[0];
+
+        if(s && e) {
+            range.setStartAfter(s);
+            range.setEndBefore(e);
+            selection.addRange(range);
+        }
+    };
+    
+    function verifyTagInsertPoint(node) {
+        if(node.nodeType == 3) { // Text Node
+            node = node.parentNode;
+        }
+
+        if (node.nodeType != 1) { 
+            return false;
+        }
+
+        node = $(node);
+        var xtype = node.attr('x-node');
+
+        if (!xtype || (xtype.search(':') >= 0) ||
+            xtype == 'motyw' || xtype == 'begin' || xtype == 'end') {
+            return false;
+        }
+        
+        // don't allow themes inside annotations
+        if( node.is('*[x-annotation-box] *') )
+            return false;
+
+        return true;
+    }
+    
+    function addAnnotation()
+    {
+        var selection = window.getSelection();
+        var n = selection.rangeCount;
+
+        if (n == 0) {
+            window.alert("Nie zaznaczono żadnego obszaru");
+            return false;
+        }
+
+        // for now allow only 1 range
+        if (n > 1) {
+            window.alert("Zaznacz jeden obszar");
+            return false;
+        }
+
+        // remember the selected range
+        var range = selection.getRangeAt(0);
+
+        if (!verifyTagInsertPoint(range.endContainer)) {
+            window.alert("Nie można wstawić w to miejsce przypisu.");
+            return false;
+        }
+
+        var text = range.toString();
+        var tag = $('<span></span>');
+        range.collapse(false);
+        range.insertNode(tag[0]);
+
+        xml2html({
+            xml: '<pr><slowo_obce>'+text+'</slowo_obce> --- </pr>',
+            success: function(text) {
+                var t = $(text);
+                tag.replaceWith(t);
+                openForEdit(t);
+            },
+            error: function() {
+                tag.remove();
+                alert('Błąd przy dodawaniu przypisu:' + errors);                
+            }
+        })
+    }
+    
+    function addTheme()
+    {
+        var selection = window.getSelection();
+        var n = selection.rangeCount;
+
+        if(n == 0) {
+            window.alert("Nie zaznaczono żadnego obszaru");
+            return false;
+        }
+
+        // for now allow only 1 range
+        if(n > 1) {
+            window.alert("Zaznacz jeden obszar");
+            return false;
+        }
+
+        // remember the selected range
+        var range = selection.getRangeAt(0);
+
+        // verify if the start/end points make even sense -
+        // they must be inside a x-node (otherwise they will be discarded)
+        // and the x-node must be a main text
+        if (!verifyTagInsertPoint(range.startContainer)) {
+            window.alert("Motyw nie może się zaczynać w tym miejscu.");
+            return false;
+        }
+
+        if (!verifyTagInsertPoint(range.endContainer)) {
+            window.alert("Motyw nie może się kończyć w tym miejscu.");
+            return false;
+        }
+
+        var date = (new Date()).getTime();
+        var random = Math.floor(4000000000*Math.random());
+        var id = (''+date) + '-' + (''+random);
+
+        var spoint = document.createRange();
+        var epoint = document.createRange();
+
+        spoint.setStart(range.startContainer, range.startOffset);
+        epoint.setStart(range.endContainer, range.endOffset);
+
+        var mtag, btag, etag, errors;
+
+        // insert theme-ref
+                
+        xml2html({
+            xml: '<end id="e'+id+'" />',
+            success: function(text) {
+                etag = $('<span></span>');
+                epoint.insertNode(etag[0]);
+                etag.replaceWith(text);
+                xml2html({
+                    xml: '<motyw id="m'+id+'">motyw</motyw>',
+                    success: function(text) {
+                        mtag = $('<span></span>');
+                        spoint.insertNode(mtag[0]);
+                        mtag.replaceWith(text);
+                        xml2html({
+                            xml: '<begin id="b'+id+'" />',
+                            success: function(text) {
+                                btag = $('<span></span>');
+                                spoint.insertNode(btag[0])
+                                btag.replaceWith(text);
+                                selection.removeAllRanges();
+                                openForEdit($('.motyw[theme-class=' + id + ']'));
+                            }
+                        });
+                    }
+                });
+            }
+        });
+    }
+    
+    // function removeTheme($origin) {
+    //     
+    // }
+    
+    function openForEdit($origin)
+    {       
+        var $box = null
+    
+        // annotations overlay their sub box - not their own box //
+        if($origin.is(".annotation-inline-box")) {
+            $box = $("*[x-annotation-box]", $origin);
+        } else {
+            $box = $origin;
+        }
+        
+        var x = $box[0].offsetLeft;
+        var y = $box[0].offsetTop;
+        var w = $box.outerWidth();
+        var h = $box.innerHeight();
+    
+        if ($origin.is(".annotation-inline-box")) {
+            w = Math.max(w, 400);
+            h = Math.max(h, 60);
+        }
+        
+        // start edition on this node
+        var $overlay = $('<div class="html-editarea"><button class="accept-button">Zapisz</button><button class="delete-button">Usuń</button><textarea></textarea></div>').css({
+            position: 'absolute',
+            height: h,
+            left: x,
+            top: y,
+            width: w
+        }).appendTo($box[0].offsetParent || $box.parent()).show();
+        
+        if ($origin.is('.motyw')) {
+            $('textarea', $overlay).autocomplete(['Ala ma kota', 'Kot ma Alę', 'HIV', 'motyw'], {
+                autoFill: true,
+                multiple: true,
+                selectFirst: true
+            });
+        }
+        
+        $('.delete-button', $overlay).click(function() {
+            if ($origin.is('.motyw')) {
+                $('[theme-class=' + $origin.attr('theme-class') + ']').remove();
+            } else {
+                $origin.remove();
+            }
+            $overlay.remove();
+            $(document).unbind('click.blur-overlay');
+            return false;
+        })
+        
+        
+        var serializer = new XMLSerializer();
+        
+        html2xml({
+            xml: serializer.serializeToString($box[0]),
+            inner: true,
+            success: function(text) {
+                $('textarea', $overlay).val($.trim(text));
+                
+                setTimeout(function() {
+                    $('textarea', $overlay).elastic().focus();
+                }, 50);
+                
+                function save(argument) {
+                    var nodeName = $box.attr('x-node') || 'pe';
+                    xml2html({
+                        xml: '<' + nodeName + '>' + $('textarea', $overlay).val() + '</' + nodeName + '>',
+                        success: function(element) {
+                            $box.html($(element).html());
+                            $overlay.remove();
+                        },
+                        error: function(text) {
+                            $overlay.remove();
+                            alert('Błąd! ' + text);
+                        }
+                    })
+                }
+                
+                $('.accept-button', $overlay).click(function() {
+                    save();
+                });
+                
+                $(document).bind('click.blur-overlay', function(event) {
+                    if ($(event.target).parents('.html-editarea').length > 0) {
+                        return;
+                    }
+                    save();
+                    
+                    $(document).unbind('click.blur-overlay');
+                });
+                
+                // $('textarea', $overlay).one('blur', function(event) {
+                //     var nodeName = $box.attr('x-node') || 'pe';
+                //     xml2html({
+                //         xml: '<' + nodeName + '>' + $('textarea', $overlay).val() + '</' + nodeName + '>',
+                //         success: function(element) {
+                //             $box.html($(element).html());
+                //             $overlay.remove();
+                //         },
+                //         error: function(text) {
+                //             $overlay.remove();
+                //             alert('Błąd! ' + text);
+                //         }
+                //     })
+                // });
+            }, error: function(text) {
+                alert('Błąd! ' + text);
+            }
+        });
+    }
+    
+    $('.edit-button').live('click', function(event) {
+        event.preventDefault();
+        openForEdit($(this).parent());
+    });
+    
+
+    
+    var button = $('<button class="edit-button">Edytuj</button>');
+    $(element).bind('mousemove', function(event) {
+        var editable = $(event.target).closest('*[x-editable]');
+        $('.active[x-editable]', element).not(editable).removeClass('active').children('.edit-button').remove();
+        if (!editable.hasClass('active')) {
+            editable.addClass('active').append(button);
+        }
+    });
+
+    $('.motyw').live('click', function() {
+        selectTheme($(this).attr('theme-class'));
+    });
+    
+    $('#insert-annotation-button').click(function() {
+        addAnnotation();
+        return false;
+    });
+    
+    $('#insert-theme-button').click(function() {
+        addTheme();
+        return false;
+    });
+}
+
+
 $(function() {
+    gallery('#sidebar', $('#document-meta .gallery').html());
+    html('#html-view');
+    
     CodeMirror.fromTextArea('id_text', {
         parserfile: 'parsexml.js',
-        path: "/static/js/lib/codemirror/",
-        stylesheet: "/static/css/xmlcolors.css",
+        path: STATIC_URL + "js/lib/codemirror/",
+        stylesheet: STATIC_URL + "css/xmlcolors.css",
         parserConfig: {
             useHTMLKludges: false
         },
@@ -124,65 +602,58 @@ $(function() {
         tabMode: 'spaces',
         indentUnit: 0,
         initCallback: function(editor) {
+            $('#save-button').click(function(event) {
+                event.preventDefault();
+                $.blockUI({message: $('#save-dialog')});
+            });
             
-            function createXSLT(xsl) {
-                var p = new XSLTProcessor();
-                p.importStylesheet(xsl);
-                return p;
-            }
+            $('#save-ok').click(function() {
+                $.blockUI({message: 'Zapisywanie...'});
+                
+                function doSave (argument) {
+                    var metaComment = '<!--';
+                    $('#document-meta div').each(function() {
+                        metaComment += '\n\t' + $(this).attr('class') + ': ' + $(this).html();
+                    });
+                    metaComment += '\n-->'
 
-            function transform() {
-                $.ajax({
-                    url: '/static/xsl/wl2html_client.xsl',
-                    dataType: 'xml',
-                    success: function(data) {
-                        var doc = null;
-                        var parser = new DOMParser();
-                        var serializer = new XMLSerializer();
-                        var htmlXSL = createXSLT(data);
-
-                        doc = editor.getCode().replace(/\/\s+/g, '<br />');
-                        doc = parser.parseFromString(doc, 'text/xml');
-                        console.log('xml', doc);
-                        doc = htmlXSL.transformToFragment(doc, document);
-                        console.log('after transform', doc);
-                        $('#html-view').html(doc.firstChild);
-                    },
-                    error: function() {alert('Error loading XSL!')}
-                });        
-            };
-
-            function reverseTransform () {
-                $.ajax({
-                    url: '/static/xsl/html2wl_client.xsl',
-                    dataType: 'xml',
-                    success: function(data) {
-                        var doc = null;
-                        var parser = new DOMParser();
-                        var serializer = new XMLSerializer();
-                        var xsl = createXSLT(data);
-
-                        doc = serializer.serializeToString($('#html-view div').get(0))
-                        doc = parser.parseFromString(doc, 'text/xml');
-                        console.log('xml',doc, doc.documentElement);
-                        // TODO: Sprawdzenie błędów
-                        doc = xsl.transformToDocument(doc);
-                        console.log('after transform', doc, doc.documentElement);
-                        doc = serialize(doc.documentElement).join('');
-                        // doc = serializer.serializeToString(doc.documentElement)
-                        editor.setCode(doc);
-                    },
-                    error: function() {alert('Error loading XSL!')}
-                });
-            };
+                    var data = {
+                        name: $('#document-name').html(),
+                        text: metaComment + editor.getCode(),
+                        revision: $('#document-revision').html(),
+                        author: 'annonymous',
+                        comment: $('#komentarz').val()
+                    };
 
-            $('#save-button').click(function(event) {
-                event.preventDefault();
-                console.log(editor.getCode(), $('form input[name=text]').get(0));
-                $('form textarea[name=text]').val(editor.getCode());
-                $('form').ajaxSubmit(function() {
-                    alert('Udało się!');
-                });
+                    $.ajax({
+                        url: document.location.href,
+                        type: "POST",
+                        dataType: "json",
+                        data: data,                
+                        success: function(data) {
+                            if (data.text) {
+                                editor.setCode(data.text);
+                                $('#document-revision').html(data.revision);
+                            } else {
+                                alert(data.errors);
+                            }
+                            $.unblockUI();
+                        },
+                        error: function(xhr, textStatus, errorThrown) {
+                            alert('error: ' + textStatus + ' ' + errorThrown);
+                        },
+                    })
+                }
+                
+                if ('#simple-view-tab.active') {
+                    reverseTransform(editor, doSave);
+                } else {
+                    doSave();
+                }
+            });
+            
+            $('#save-cancel').click(function() {
+                $.unblockUI();
             });
 
             $('#simple-view-tab').click(function() {
@@ -193,7 +664,7 @@ $(function() {
                 $('#source-view-tab').removeClass('active');
                 $('#source-editor').hide();
                 $('#simple-editor').show();
-                transform();
+                transform(editor);
             });
 
             $('#source-view-tab').click(function() {
@@ -204,10 +675,10 @@ $(function() {
                 $('#simple-view-tab').removeClass('active');
                 $('#simple-editor').hide();
                 $('#source-editor').show();
-                reverseTransform();
+                reverseTransform(editor);
             });
 
-            $('.toolbar button').click(function(event) {
+            $('#source-editor .toolbar button').click(function(event) {
                 event.preventDefault();
                 var params = eval("(" + $(this).attr('ui:action-params') + ")");
                 scriptletCenter.scriptlets[$(this).attr('ui:action')](editor, params);
@@ -223,21 +694,7 @@ $(function() {
             $('.toolbar-buttons-container').hide();
             $('.toolbar select').change();
 
-            var button = $('<button class="edit-button">Edytuj</button>');
-            $('#html-view').bind('mousemove', function(event) {
-                var editable = $(event.target).closest('*[x-editable]');
-                $('#html-view .active[x-editable]').not(editable).removeClass('active').children('.edit-button').remove();
-                if (!editable.hasClass('active')) {
-                    editable.addClass('active').append(button);
-                }
-            });
-
-            $('.motyw').live('click', function() {
-                selectTheme($(this).attr('theme-class'));
-            });
-            
             $('#simple-view-tab').click();
-            
         }
     });
     
@@ -249,15 +706,13 @@ $(function() {
     
     $('.vsplitbar').click(function() {
         if ($('#sidebar').width() == 0) {
-            $('#sidebar').width(480).show();
+            $('#sidebar').width(480).css({right: 0}).show();
             $('#source-editor, #simple-editor').css({right: 495});
-            $('.vsplitbar').css({right: 480})
-            // $('#splitter').trigger('resize', [$(window).width() - 480]);
+            $('.vsplitbar').css({right: 480}).addClass('active');
         } else {
             $('#sidebar').width(0).hide();
             $('#source-editor, #simple-editor').css({right: 15});
-            $('.vsplitbar').css({right: 0});
-            // $('#splitter').trigger('resize', [$(window).width()]);
+            $('.vsplitbar').css({right: 0}).removeClass('active');
         }
         $(window).resize();
     });