| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -153,7 +153,7 @@ |
| 154 | 154 | array( |
| 155 | 155 | 'src' => 'js/plugins/jquery.wikiEditor.js', |
| 156 | 156 | 'class' => 'j.wikiEditor', |
| 157 | | - 'version' => 55 |
| | 157 | + 'version' => 56 |
| 158 | 158 | ), |
| 159 | 159 | array( |
| 160 | 160 | 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', |
| — | — | @@ -191,10 +191,10 @@ |
| 192 | 192 | 'version' => 1 ), |
| 193 | 193 | ), |
| 194 | 194 | 'combined' => array( |
| 195 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 158 ), |
| | 195 | + array( 'src' => 'js/plugins.combined.js', 'version' => 159 ), |
| 196 | 196 | ), |
| 197 | 197 | 'minified' => array( |
| 198 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 158 ), |
| | 198 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 159 ), |
| 199 | 199 | ), |
| 200 | 200 | ), |
| 201 | 201 | ); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js |
| — | — | @@ -568,7 +568,9 @@ |
| 569 | 569 | y = parentHtml.scrollTop() > 0 ? y + html.scrollTop() - parentHtml.scrollTop() : y; |
| 570 | 570 | y = parentBody.scrollTop() > 0 ? y + body.scrollTop() - parentBody.scrollTop() : y; |
| 571 | 571 | } |
| 572 | | - if ( force || y < html.scrollTop() || y > html.scrollTop() + context.$iframe.height() ) { |
| | 572 | + var topBound = html.scrollTop() > body.scrollTop() ? html.scrollTop() : body.scrollTop(), |
| | 573 | + bottomBound = topBound + context.$iframe.height(); |
| | 574 | + if ( force || y < topBound || y > bottomBound ) { |
| 573 | 575 | html.scrollTop( y ); |
| 574 | 576 | body.scrollTop( y ); |
| 575 | 577 | } |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -7049,7 +7049,9 @@ |
| 7050 | 7050 | y = parentHtml.scrollTop() > 0 ? y + html.scrollTop() - parentHtml.scrollTop() : y; |
| 7051 | 7051 | y = parentBody.scrollTop() > 0 ? y + body.scrollTop() - parentBody.scrollTop() : y; |
| 7052 | 7052 | } |
| 7053 | | - if ( force || y < html.scrollTop() || y > html.scrollTop() + context.$iframe.height() ) { |
| | 7053 | + var topBound = html.scrollTop() > body.scrollTop() ? html.scrollTop() : body.scrollTop(), |
| | 7054 | + bottomBound = topBound + context.$iframe.height(); |
| | 7055 | + if ( force || y < topBound || y > bottomBound ) { |
| 7054 | 7056 | html.scrollTop( y ); |
| 7055 | 7057 | body.scrollTop( y ); |
| 7056 | 7058 | } |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -461,7 +461,7 @@ |
| 462 | 462 | context.$content.trigger('encapsulateSelection',[pre,options.peri,post,options.ownline,options.replace]);return context.$textarea;},'getCaretPosition':function(options){},'setSelection':function(options){var sc=options.startContainer,ec=options.endContainer;sc=sc.jquery?sc[0]:sc;ec=ec.jquery?ec[0]:ec;if(context.$iframe[0].contentWindow.getSelection){var sel=context.$iframe[0].contentWindow.getSelection();while(sc.firstChild&&sc.nodeName!='#text'){sc=sc.firstChild;} |
| 463 | 463 | while(ec.firstChild&&ec.nodeName!='#text'){ec=ec.firstChild;} |
| 464 | 464 | var range=context.$iframe[0].contentWindow.document.createRange();range.setStart(sc,options.start);range.setEnd(ec,options.end);sel.removeAllRanges();sel.addRange(range);context.$iframe[0].contentWindow.focus();}else if(context.$iframe[0].contentWindow.document.body.createTextRange){var range=context.$iframe[0].contentWindow.document.body.createTextRange();range.moveToElementText(sc);range.moveStart('character',options.start);var range2=context.$iframe[0].contentWindow.document.body.createTextRange();range2.moveToElementText(ec);range2.collapse();range2.moveEnd('character',options.end);range.setEndPoint('EndToEnd',range2);range.select();}},'scrollToCaretPosition':function(options){},'scrollToTop':function($element,force){var html=context.$content.closest('html'),body=context.$content.closest('body'),parentHtml=$('html'),parentBody=$('body');var y=$element.offset().top;if(!$.browser.msie){y=parentHtml.scrollTop()>0?y+html.scrollTop()-parentHtml.scrollTop():y;y=parentBody.scrollTop()>0?y+body.scrollTop()-parentBody.scrollTop():y;} |
| 465 | | -if(force||y<html.scrollTop()||y>html.scrollTop()+context.$iframe.height()){html.scrollTop(y);body.scrollTop(y);} |
| | 465 | +var topBound=html.scrollTop()>body.scrollTop()?html.scrollTop():body.scrollTop(),bottomBound=topBound+context.$iframe.height();if(force||y<topBound||y>bottomBound){html.scrollTop(y);body.scrollTop(y);} |
| 466 | 466 | $element.trigger('scrollToTop');},'beforeSelection':function(selector,strict){if(typeof selector=='undefined'){selector='*';} |
| 467 | 467 | var e;if(context.$iframe[0].contentWindow.getSelection){context.$iframe[0].contentWindow.focus();var range=context.$iframe[0].contentWindow.getSelection().getRangeAt(0);e=range.startContainer;}else if(context.$iframe[0].contentWindow.document.selection){return $([]);} |
| 468 | 468 | if(e.nodeName!='#text'){var newE=e.firstChild;for(var i=0;i<range.startOffset-1&&newE;i++){newE=newE.nextSibling;} |