| Property changes on: branches/wmf-deployment/extensions/LiquidThreads_alpha/jquery/js2.combined.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /trunk/extensions/LiquidThreads/jquery/js2.combined.js:57390,59879,59883 |
| 2 | 2 | + /trunk/extensions/LiquidThreads/jquery/js2.combined.js:57390,59879,59883,59885-59886 |
| Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/View.php |
| — | — | @@ -822,10 +822,8 @@ |
| 823 | 823 | |
| 824 | 824 | $basePath = "$wgScriptPath/extensions/$wgLiquidThreadsExtensionName"; |
| 825 | 825 | |
| 826 | | - if ( !$wgEnableJS2system ) { |
| 827 | | - $wgOut->addScriptFile( "$basePath/jquery/js2.combined.js" ); |
| 828 | | - $wgOut->addExtensionStyle( "$basePath/jquery/jquery-ui-1.7.2.css" ); |
| 829 | | - } |
| | 826 | + $wgOut->addScriptFile( "$basePath/jquery/js2.combined.js" ); |
| | 827 | + $wgOut->addExtensionStyle( "$basePath/jquery/jquery-ui-1.7.2.css" ); |
| 830 | 828 | |
| 831 | 829 | $wgOut->addScriptFile( "$basePath/jquery/jquery.autogrow.js" ); |
| 832 | 830 | |
| Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/lqt.js |
| — | — | @@ -28,6 +28,7 @@ |
| 29 | 29 | |
| 30 | 30 | var repliesElement = $j(container).contents().filter('.lqt-thread-replies'); |
| 31 | 31 | var replyDiv = repliesElement.contents().filter('.lqt-reply-form'); |
| | 32 | + replyDiv = replyDiv.add( $j(container).contents().filter('.lqt-reply-form') ); |
| 32 | 33 | if (!replyDiv.length) { |
| 33 | 34 | // Create a div for it |
| 34 | 35 | replyDiv = $j('<div class="lqt-reply-form lqt-edit-form"/>'); |
| — | — | @@ -46,6 +47,7 @@ |
| 47 | 48 | |
| 48 | 49 | repliesElement.find('.lqt-replies-finish').before( replyDiv ); |
| 49 | 50 | } |
| | 51 | + replyDiv.show(); |
| 50 | 52 | |
| 51 | 53 | replyDiv = replyDiv[0]; |
| 52 | 54 | |
| Property changes on: branches/wmf-deployment/extensions/LiquidThreads_alpha |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 53 | 55 | - /trunk/extensions/LiquidThreads:57390,58990-59196,59198-59661,59666-59743,59782-59877,59879,59883 |
| 54 | 56 | + /trunk/extensions/LiquidThreads:57390,58990-59196,59198-59661,59666-59743,59782-59877,59879,59883,59885-59886 |