Merge branch 'master' into production

[redakcja.git] / redakcja / static / js / wiki / loader.js

diff --git a/redakcja/static/js/wiki/loader.js b/redakcja/static/js/wiki/loader.js
index e2d4d2b..4256115 100644 (file)
--- a/redakcja/static/js/wiki/loader.js
+++ b/redakcja/static/js/wiki/loader.js
@@ -17,10 +17,6 @@ $(function()
 
     function initialize()
        {
 
     function initialize()
        {

-               gallery = new $.wiki.ScanGalleryPerspective({
-                       doc: CurrentDocument, id: "ScanGalleryPerspective"
-               });
-

                $(document).keydown(function(event) {
                        console.log("Received key:", event);
                });
                $(document).keydown(function(event) {
                        console.log("Received key:", event);
                });


@@ -36,7 +32,7 @@ $(function()
                /*
                 * TABS
                 */
                /*
                 * TABS
                 */

-        $('#tabs li').live('click', function(event, callback) {
+        $('.tabs li').live('click', function(event, callback) {

                        $.wiki.switchToTab(this);
         });
 
                        $.wiki.switchToTab(this);
         });
 


@@ -62,19 +58,19 @@ $(function()
         $('.vsplitbar').toggle(
                        function() {
                                $.wiki.state.perspectives.ScanGalleryPerspective.show = true;
         $('.vsplitbar').toggle(
                        function() {
                                $.wiki.state.perspectives.ScanGalleryPerspective.show = true;

-                               $('#side-gallery').show();
-                               $('.vsplitbar').css('right', 480).addClass('.active');
+                               $('#sidebar').show();
+                               $('.vsplitbar').css('right', 480).addClass('active');

                                $('#editor .editor').css('right', 510);
                                $(window).resize();
                                $('#editor .editor').css('right', 510);
                                $(window).resize();

-                               gallery.onEnter();
+                               $.wiki.perspectiveForTab('#tabs-right .active').onEnter();

                        },
                        function() {
                                $.wiki.state.perspectives.ScanGalleryPerspective.show = false;
                        },
                        function() {
                                $.wiki.state.perspectives.ScanGalleryPerspective.show = false;

-                               $('#side-gallery').hide();
+                               $('#sidebar').hide();

                                $('.vsplitbar').css('right', 0).removeClass('active');
                                $('#editor .editor').css('right', 30);
                                $(window).resize();
                                $('.vsplitbar').css('right', 0).removeClass('active');
                                $('#editor .editor').css('right', 30);
                                $(window).resize();

-                               gallery.onExit();
+                               $.wiki.perspectiveForTab('#tabs-right .active').onExit();

                        }
                );
 
                        }
                );
 


@@ -137,6 +133,6 @@ $(function()
        /*
         * Initialize all perspectives
         */
        /*
         * Initialize all perspectives
         */

-       initAll( $.makeArray($('ol#tabs li')), initialize);
+       initAll( $.makeArray($('.tabs li')), initialize);

        console.log(location.hash);
 });
        console.log(location.hash);
 });