diffs (179 lines):
diff -r 584e08e4370d -r 7128b83b0d2e bin/upgrading/en.dat
--- a/bin/upgrading/en.dat Mon Jul 06 01:29:30 2009 +0800
+++ b/bin/upgrading/en.dat Mon Jul 06 08:08:55 2009 +0800
@@ -3499,8 +3499,6 @@ talk.readsimilar=Read similar journal en
talk.replytothis=Reply to this
-talk.screened=Comment screened
-
talk.somebodywrote=[[realname]] ([[userlink]]) wrote,
talk.somebodywrote_comm=[[realname]] ([[userlink]]) wrote in [[commlink]],
diff -r 584e08e4370d -r 7128b83b0d2e cgi-bin/LJ/S2.pm
--- a/cgi-bin/LJ/S2.pm Mon Jul 06 01:29:30 2009 +0800
+++ b/cgi-bin/LJ/S2.pm Mon Jul 06 08:08:55 2009 +0800
@@ -3127,7 +3127,7 @@ sub _print_quickreply_link
}
$onclick = "" unless $page->{'_type'} eq 'EntryPage';
- $onclick = "" if $page->{'_u'}->{'opt_whocanreply'} eq 'friends' and
$remote and not LJ::is_friend($page->{'_u'}, $remote);
+ $onclick = "" unless LJ::is_enabled('s2quickreply');
# See if we want to force them to change their password
my $bp = LJ::bad_password_redirect({ 'returl' => 1 });
diff -r 584e08e4370d -r 7128b83b0d2e htdocs/customize/advanced/layeredit.bml
--- a/htdocs/customize/advanced/layeredit.bml Mon Jul 06 01:29:30 2009 +0800
+++ b/htdocs/customize/advanced/layeredit.bml Mon Jul 06 08:08:55 2009 +0800
@@ -146,14 +146,18 @@
// -->
</script>
-$includes
-
<!--[if IE]>
<style type="text/css">
html {
overflow: hidden;
}
+</style>
+<![endif]-->
+$includes
+
+<!--[if IE]>
+<style type="text/css">
div.reference {
height: expression(xGetElementById('statusbar').offsetTop - (42 + 9 +
10) + "px");
}
@@ -195,9 +199,9 @@
</head>
<body onMouseMove="s2processDrag(event)" onMouseUp="s2endDrag(event)">
- <form method="post" name="s2" action="" onsubmit="return s2submit()">
- $formauth
- <input type="hidden" name="action" value="compile" />
+ <form method="post">
+ $formauth
+ <input type="hidden" name="action" value="compile" />
<div class="header">
<h1>$title</h1>
@@ -274,9 +278,14 @@
<div class="gutter"> </div>
<div id="status">Ready.</div>
</div>
-
- </form>
+<script type="text/javascript">
+ if (navigator.userAgent.indexOf('Safari') > -1) {
+ xGetElementById('main').style.width = '100%';
+ }
+
+ s2init();
+</script>
</body>
</html>
diff -r 584e08e4370d -r 7128b83b0d2e htdocs/js/s2edit/s2edit.js
--- a/htdocs/js/s2edit/s2edit.js Mon Jul 06 01:29:30 2009 +0800
+++ b/htdocs/js/s2edit/s2edit.js Mon Jul 06 08:08:55 2009 +0800
@@ -28,7 +28,3 @@ function s2initIndex()
{
s2index = new Object();
}
-
-LiveJournal.register_hook('page_load', function () {
- s2init();
-});
diff -r 584e08e4370d -r 7128b83b0d2e htdocs/js/s2edit/s2gui.js
--- a/htdocs/js/s2edit/s2gui.js Mon Jul 06 01:29:30 2009 +0800
+++ b/htdocs/js/s2edit/s2gui.js Mon Jul 06 08:08:55 2009 +0800
@@ -261,16 +261,6 @@ function s2buildReference()
s2buildClasses();
s2buildFunctions();
s2buildProperties();
-
- if (window.name)
- {
- setTimeout(function() {
- var pos = window.name.split(':'), textarea =
s2getCodeArea();
- textarea.scrollTop = +pos[0] || 0;
- nxpositionCursor(textarea, pos[1] || 0)
- window.name = '';
- }, 1)
- }
}
// ---------------------------------------------------------------------------
@@ -459,10 +449,3 @@ function s2initDrag()
return true;
}
-
-function s2submit()
-{
- // save position textarea, where reload page
- var textarea = s2getCodeArea();
- window.name = textarea.scrollTop + ':' + nxgetPositionCursor(textarea);
-}
diff -r 584e08e4370d -r 7128b83b0d2e htdocs/js/s2edit/xlib.js
--- a/htdocs/js/s2edit/xlib.js Mon Jul 06 01:29:30 2009 +0800
+++ b/htdocs/js/s2edit/xlib.js Mon Jul 06 08:08:55 2009 +0800
@@ -85,28 +85,12 @@ function nxpositionCursor(obj, pos)
{
if (nxIE) {
var range = obj.createTextRange();
- range.collapse(true);
- range.moveEnd('character', pos);
- range.moveStart('character', pos);
+ range.move('character', from);
range.select(); // TODO: test this
} else {
obj.selectionStart = obj.selectionEnd = pos;
obj.focus();
}
-}
-
-function nxgetPositionCursor(obj)
-{
- if ('selectionStart' in obj) {
- return obj.selectionStart;
- }
- if (document.selection && document.selection.createRange) {
- obj.focus();
- var range = document.selection.createRange();
- return 0 - range.duplicate().moveStart('character', -100000);
- }
-
- return 0;
}
// Scrolls the object to the given line out of the given total number of lines.
diff -r 584e08e4370d -r 7128b83b0d2e htdocs/talkread.bml
--- a/htdocs/talkread.bml Mon Jul 06 01:29:30 2009 +0800
+++ b/htdocs/talkread.bml Mon Jul 06 08:08:55 2009 +0800
@@ -51,7 +51,6 @@ body<=
expand talk.expandlink
replythis talk.replytothis
unscreentoreply talk.unscreentoreply
- screened talk.screened
frozen talk.frozen
link talk.commentpermlink
deleted .subjectdeleted
@@ -686,12 +685,8 @@ body<=
$ret .= "(<a href='$bp'>$T{'replythis'}</a>) ";
} else {
if ($post->{state} eq 'S') {
- if ( LJ::can_manage( $remote, $u ) ) {
- # show unscreen to reply link id comment
screened
- $ret .= "(<a
href='$LJ::SITEROOT/talkscreen.bml?mode=unscreen&${jargent}talkid=$dtid'>$T{'unscreentoreply'}</a>)
";
- } else {
- $ret .= "($T{ 'screened' })";
- }
+ # show unscreen to reply link id comment screened
+ $ret .= "(<a
href='$LJ::SITEROOT/talkscreen.bml?mode=unscreen&${jargent}talkid=$dtid'>$T{'unscreentoreply'}</a>)
";
} else {
$ret .= "(" . LJ::make_qr_link($dtid,
$post->{'subject'}, $T{'replythis'}, $replyurl) . ") ";
}
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
