Changeset 3442 for trunk/system/views

Timestamp:

09/12/2008 10:15:39 PM (3 months ago)

Author:

JAAulde

Message:

Removed jQuery reliance in Kohana inline error displays

Location:

trunk/system/views/kohana

Files:

• error.php (modified) (1 diff)
• error_script.js (modified) (1 diff)
• error_style.css (modified) (1 diff)

trunk/system/views/kohana/error.php

@@ -1 @@
-<pre class="kohana_error"><a href="#show_trace"><?php echo $code ?></a>: <code><?php echo $error ?></code> [ <strong><?php echo $file ?></strong>, line <strong><?php echo $line ?></strong> ]</pre>
-<div class="kohana_trace">
+<pre class="kohana_error"><a href="#show_trace" id="kohana_error_trace_link_<?php echo $instance_identifier ?>"><?php echo $code ?></a>: <code><?php echo $error ?></code> [ <strong><?php echo $file ?></strong>, line <strong><?php echo $line ?></strong> ]</pre>
+<div class="kohana_trace" id="kohana_error_trace_<?php echo $instance_identifier ?>">
 <?php if ( ! empty($source)): ?>
-<div class="source"><a href="#show_source">Source</a><pre><?php echo $source ?></pre></div>
+<div class="source"><a href="#show_source" id="kohana_error_source_link_<?php echo $instance_identifier ?>">Source</a><pre id="kohana_error_source_<?php echo $instance_identifier ?>"><?php echo $source ?></pre></div>
 <?php endif ?>
 <?php if ( ! empty($trace)): ?>

trunk/system/views/kohana/error_script.js

@@ -1 @@
-(function($){
-// The $ variable is aliased and ready
-$(document).ready(function()
-{
-        $('pre.kohana_error a[href="#show_trace"]').click(function()
+var kohana_errors_ui = (function()
+{                               
+        var kohana_trace_href = '#show_trace';                  
+        var kohana_source_href = '#show_source';
+
+        var old_onload = (typeof window.onload == 'function') ? window.onload : function(){};
+
+        window.onload = function()
         {
-                $(this).parents('pre.kohana_error').next('div.kohana_trace').toggle();
+                old_onload();
 
-                return false;
-        });
-        $('div.kohana_trace a[href="#show_source"]').click(function()
-        {
-                $(this).next('pre').toggle();
+                var current_href;
 
-                return false;
-        });
-});
-// End of $ alias
-})(jQuery.noConflict());
+                var document_links = document.getElementsByTagName('a');
+
+                for(var a = 0; a < document_links.length; a++)
+                {
+                        current_href = document_links[a].getAttribute('href');
+                        if(typeof current_href == 'string')
+                        {
+                                switch(current_href)
+                                {
+                                        case kohana_trace_href:
+                                        case kohana_source_href:
+                                                document_links[a].onclick = kohana_errors_ui.toggler;
+                                                document_links[a].onclick();
+                                                break;
+                                }
+                        }
+                }
+        }
+
+        return {
+                toggler : function()
+                {
+                        var id, list, instance_identifier;
+
+                        id = this.getAttribute('id');
+                        if(typeof id == 'string')
+                        {
+                                list = id.split('_');
+                                instance_identifier = list[4];
+
+                                kohana_errors_ui.toggle_block_show('kohana_error_'+list[2]+'_'+instance_identifier);
+                        }
+
+                        return false;
+                },
+                set_display : function(element, display)
+                {
+                        if(typeof element == 'string')
+                                element = document.getElementById(element);
+
+                        if(typeof element == 'object' && element !== 'null')
+                                element.style.display = display;
+                },
+                toggle_block_show : function(element)
+                {
+                        if(typeof element == 'string')
+                                element = document.getElementById(element);
+
+                        if(typeof element == 'object' && element !== 'null')
+                                kohana_errors_ui.set_display(element, ( ! element.style.display || element.style.display == 'block' ? 'none' : 'block'));
+                }
+        }
+})();

trunk/system/views/kohana/error_style.css

@@ -6 +6 @@
         pre.kohana_error code { font-size: 1em; font-family: monospace; padding: 0 0.5em; }
         pre.kohana_error strong { font-weight: bold; }
-div.kohana_trace { display: none; border-top: dotted 1px #809953; }
+div.kohana_trace { border-top: dotted 1px #809953; }
         div.kohana_trace div.source { margin-bottom: 1em; }
                 div.kohana_trace div.source a { display: block; }
-                div.kohana_trace div.source pre { display: none; padding: 1em; background: #fff; border: dotted 1px #809953; }
+                div.kohana_trace div.source pre { padding: 1em; background: #fff; border: dotted 1px #809953; }
                         div.kohana_trace div.source pre span { background: #ede33b; }
         div.kohana_trace ul.trace { list-style: none; padding: 0; margin: 0; line-height: 120%; }