Changeset 484 for trunk/modules/user_guide

Timestamp:

09/03/2007 03:37:01 PM (15 months ago)

Author:

Shadowhand

Message:

Removing AJAX from the User Guide, due to issues with bookmarking, and inline links. Overall, it causes more issues than it solves.

Location:

trunk/modules/user_guide

Files:

• controllers/user_guide.php (modified) (1 diff)
• views/user_guide/js/effects.js (modified) (3 diffs)

trunk/modules/user_guide/controllers/user_guide.php

@@ -44 +44 @@
                 $content  = rtrim('user_guide/'.$locale.'content/'.$category.'/'.$section, '/');
 
-                // Load session for AJAX page storage
-                $this->load->library('session');
-
                 // Load markdown
                 require Kohana::find_file('vendor', 'Markdown');
 
-                // Show content
-                if ($this->input->get('ajax') === 'true')
-                {
-                        // Set the AJAX return page, for refreshing
-                        $this->session->set('ajax_return', $this->uri->string());
+                $template          = $this->load->view('user_guide/'.$locale.'template');
+                $template->menu    = $this->load->view('user_guide/'.$locale.'menu', array('active_category' => $category, 'active_section' => $section));
+                $template->content = $this->load->view($content)->render(FALSE, 'Markdown');
 
-                        // Just the content, ma'am!
-                        $this->load->view($content)->render(TRUE, 'Markdown');
-                }
-                else
-                {
-                        // Return the user to the page they were on
-                        if ($ajax_return = $this->session->get_once('ajax_return'))
-                                url::redirect($ajax_return);
-                        
-                        $template          = $this->load->view('user_guide/'.$locale.'template');
-                        $template->menu    = $this->load->view('user_guide/'.$locale.'menu', array('active_category' => $category, 'active_section' => $section));
-                        $template->content = $this->load->view($content)->render(FALSE, 'Markdown');
-
-                        // Display output
-                        $template->render(TRUE);
-                }
+                // Display output
+                $template->render(TRUE);
         }
 

trunk/modules/user_guide/views/user_guide/js/effects.js

@@ -1 +1 @@
 // $Id$
-// Special Kohana functions
-var Kohana = {
-        loading: false,
-        waiting: false,
-        toggleLoading: function(on) {
-                // If we are waiting for an animation, retry in 5ms
-                if (Kohana.waiting == true) {
-                        setTimeout('Kohana.toggleLoading('+on+')', 20);
-                        return false;
-                }
-                // Toggle waiting state
-                Kohana.waiting = true;
-                if (on == true) { // Show loading
-                        this.loading.slideDown(250, function() {
-                                Kohana.waiting = false;
-                        });
-                } else { // Hide loading
-                        this.loading.slideUp(250, function() {
-                                Kohana.waiting = false;
-                        });
-                }
-        }
-};
 // Behavior attachment
 $(document).ready(function(){
@@ -31 +8 @@
                 $(this).fadeTo(300, 0.7)
         });
-        // Append the AJAX loader
-        $('#container').append('<div id="loading">&nbsp;</div>');
-        // To prevent extra querying, add the loading element to Kohana after hiding it
-        Kohana.loading = $('#loading').hide();
         // Apply menu sliding effect
         $('#menu li.first').click(function(){
@@ -55 +28 @@
         // Find and hide the sub menus that are not in the active menu
         .not('.active').find('ul').hide();
-        // Add AJAX functionality to the menu links
-        $('#menu a').click(function(){
-                // Show loading
-                Kohana.toggleLoading(true);
-                // Fetch the current link
-                var link = $(this);
-                // Make AJAX request, using ?ajax=true
-                $.get(link.attr('href'), {ajax: 'true'}, function(data) {
-                        // Add the hilight class to the current link
-                        $('#menu ul li.lite').removeClass('lite');
-                        link.parent().addClass('lite');
-                        // Load new AJAX content
-                        $('#body').html(data);
-                        // Hide loading
-                        Kohana.toggleLoading(false)
-                });
-                return false;
-        });
         // For syntax highlighting
         prettyPrint();