Changeset 2792

Timestamp:

08/20/07 11:57:17 (1 year ago)

Author:

klaus.hartl

Message:

Fixed keydown handler assignments

Files:

• trunk/plugins/thickbox_reloaded/jquery.thickbox.js (modified) (6 diffs)

trunk/plugins/thickbox_reloaded/jquery.thickbox.js

@@ -90 +90 @@
                 // reveal stuff
                 dim.unbind('click').one('click', hide); // unbind should be unnecessary - WTF?
-                if (dim.is(':visible')) {
-                    loading.show();
-                    builder(); // build specific type
-                } else {
-                    //dim.fadeIn('fast', function() {
-                        dim.show();
-                        loading.show();
-                        builder(); // build specific type
-                    //});
-                }
+                if (!dim.is(':visible')) {
+                    dim.show();
+                }
+                loading.show();
+                builder(); // build specific type
+                
                 // attach keyboard event handler
                 $(document).bind('keydown', keydown).bind('keypress', blockKeys);
@@ -138 +134 @@
             function hide(callback) {
 
+                // abort pending xhr request
                 if (request) {
                     request.abort();
@@ -153 +150 @@
                 $(document).unbind('keydown', keydown).unbind('keypress', blockKeys);
                 $(window).unbind('scroll', blockScroll);
+                next = previous = function() {};
                 return false;
             }
@@ -171 +169 @@
             }
 
+            var next = function() {}, previous = next;
             function keydown(e) {
                 var key = e.which || e.keyCode || -1;
-                if (key == 27) {
-                    hide();
-                } else {
-                    blockKeys(e);
+                switch (key) {
+                    case 27: // esc
+                        hide();
+                        break;
+                    case 37: // arrow left
+                        previous();
+                        break;
+                    case 39: // arrow right
+                        next();
+                        break;
+                    default:
+                        blockKeys(e);
                 }
             }
@@ -251 +258 @@
                                         };
 
-                                        var next = '<strong id="' + TB_ID.NEXT + '"><a href="#" title="' + defaultValues.i18n.next.title + '">' + defaultValues.i18n.next.text + '</a></strong>';
-                                        var showNext = buildShowFunc(group[i + 1] || group[0]);
-
-                                        var prev = '<strong id="' + TB_ID.PREV + '"><a href="#" title="' + defaultValues.i18n.prev.title + '">' + defaultValues.i18n.prev.text + '</a></strong>';
-                                        var showPrev = buildShowFunc(group[i - 1] || group[size - 1]);
-
-                                        // overwrite keydown handler
-                                        keydown = function(e) {
-                                            var key = e.which || e.keyCode || -1;
-                                            // IE requires "timeout", I assume somehow due to this being added on
-                                            // the existing keydown handler, that's ugly, find a way to avoid
-                                            // duplicate code
-                                            // WARNING: without timeout IE freezes occasionally when using keyboard arrows
-                                            setTimeout(function() {
-                                                switch (key) {
-                                                    case 27: // esc
-                                                        hide();
-                                                        break;
-                                                    case 37: // arrow left
-                                                        showPrev();
-                                                        break;
-                                                    case 39: // arrow right
-                                                        showNext();
-                                                        break;
-                                                    default:
-                                                        blockKeys(e);
-                                                }
-                                            }, 0);
-                                        };
-                                        $(document).unbind('keydown').bind('keydown', keydown);
+                                        var nextHtml = '<strong id="' + TB_ID.NEXT + '"><a href="#" title="' + defaultValues.i18n.next.title + '">' + defaultValues.i18n.next.text + '</a></strong>';
+                                        next = buildShowFunc(group[i + 1] || group[0]);
+
+                                        var previousHtml = '<strong id="' + TB_ID.PREV + '"><a href="#" title="' + defaultValues.i18n.prev.title + '">' + defaultValues.i18n.prev.text + '</a></strong>';
+                                        previous = buildShowFunc(group[i - 1] || group[size - 1]);
 
                                     }
@@ -318 +300 @@
                                     $('<img src="' +  $$.attr('href') + '" alt="Image" width="' + imgWidth + '" height="' + imgHeight + '" title="' + title + '" />').appendTo(content);
                                     if (rel) {
-                                        $(['<p id="' + TB_ID.BROWSE + '">', (prev || ''), (next || ''), count, '</p>'].join('')).appendTo(content);
+                                        $(['<p id="' + TB_ID.BROWSE + '">', (previousHtml || ''), (nextHtml || ''), count, '</p>'].join('')).appendTo(content);
                                         if (size > 1) {
-                                            $('#' + TB_ID.NEXT + ' a').bind('click', showNext);
-                                            $('#' + TB_ID.PREV + ' a').bind('click', showPrev);
+                                            $('#' + TB_ID.NEXT + ' a').bind('click', next);
+                                            $('#' + TB_ID.PREV + ' a').bind('click', previous);
                                         }
                                     }