[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[56095] trunk

[<jon...@us...>]

Revision: 56095
          http://sourceforge.net/p/tikiwiki/code/56095
Author:   jonnybradley
Date:     2015-08-28 15:37:20 +0000 (Fri, 28 Aug 2015)
Log Message:
-----------
[MRG] Automatic merge, branches/14.x 56076 to 56093

Modified Paths:
--------------
    trunk/templates/comments.tpl

Property Changed:
----------------
    trunk/
    trunk/templates/

Index: trunk
===================================================================
--- trunk	2015-08-28 15:21:08 UTC (rev 56094)
+++ trunk	2015-08-28 15:37:20 UTC (rev 56095)

Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
 /branches/11.x:45702-47762
 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
 /branches/13.x:51407-53060,53145,53192,53882
-/branches/14.x:54079-56076
+/branches/14.x:54079-56093
 /branches/3.0:16998-18916
 /branches/4.x:22817-23908
 /branches/5.x:26025-26523,26527-28378
\ No newline at end of property
Index: trunk/templates
===================================================================
--- trunk/templates	2015-08-28 15:21:08 UTC (rev 56094)
+++ trunk/templates	2015-08-28 15:37:20 UTC (rev 56095)

Property changes on: trunk/templates
___________________________________________________________________
Modified: svn:mergeinfo
## -2,7 +2,7 ##
 /branches/11.x/templates:45702-47762
 /branches/12.x/templates:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53463,53608,55301
 /branches/13.x/templates:51407-53060,53145,53192
-/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055
+/branches/14.x/templates:54103-54145,54150-54151,54156-54187,54232-54237,54240-54306,54309-54345,54352-54391,54396-54402,54405-54418,54422-54454,54457-54473,54476-54585,54598-54622,54632-54739,54753-54780,54788-54796,54806-54859,54862-54863,54876-54894,54897-54918,54925-54929,54932-54935,54957-54966,54981-54989,54992-54996,55000-55052,55055-55159,55167-55204,55235-55299,55304-55310,55317-55332,55337-55363,55366-55486,55493-55519,55549-55571,55578-55585,55588-55658,55671-55683,55686-55741,55744-55778,55784-55857,55863-55872,55881-55910,55914-55922,55927-55971,55984-56001,56008-56019,56022-56023,56033-56040,56045-56055,56077-56093
 /branches/3.0/templates:16998-18916
 /branches/4.x/templates:22817-23908
 /branches/5.x/templates:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/templates/comments.tpl
===================================================================
--- trunk/templates/comments.tpl	2015-08-28 15:21:08 UTC (rev 56094)
+++ trunk/templates/comments.tpl	2015-08-28 15:37:20 UTC (rev 56095)
@@ -315,16 +315,14 @@
 						{if !empty($user) && $prefs.feature_comments_post_as_anonymous eq 'y'}
 							<input type="submit" class="btn btn-default btn-sm" name="comments_postComment_anonymous" value="{tr}Post as Anonymous{/tr}" onclick="needToConfirm=false;">
 						{/if}
-						<input type="submit" class="btn btn-default btn-sm" name="comments_previewComment" id="comments_previewComment" value="{tr}Preview{/tr}"
-							{if ( isset($can_attach_file) && $can_attach_file eq 'y' ) or empty($user)}{strip}
-								{assign var='file_preview_warning' value="{tr}Please note that the preview does not keep the attached file which you will have to choose before posting.{/tr}"}
-								onclick="
-							{if isset($can_attach_file) && $can_attach_file eq 'y'}
-								if ($('#userfile1').val()) alert('{$file_preview_warning|escape:"javascript"}');
-							{/if}
-							"
-							{/strip}{else} onclick="needToConfirm=false;"{/if}>
-							<input type="submit" class="btn btn-default btn-sm" name="comments_cancelComment" value="{tr}Cancel{/tr}" onclick="hide('{$postclass}'); return false">
+						<input type="submit" class="btn btn-default btn-sm" name="comments_previewComment" id="comments_previewComment" value="{tr}Preview{/tr}">
+						{jq}$("#comments_previewComment").click(function () {
+	if ($("#userfile1").val()) {
+		alert("{tr}Please note that the preview does not keep the attached file which you will have to choose before posting.{/tr}");
+	}
+	needToConfirm=false;
+});{/jq}
+						<input type="submit" class="btn btn-default btn-sm" name="comments_cancelComment" value="{tr}Cancel{/tr}" onclick="hide('{$postclass}'); return false">
 					</div>
 				</div>
 			</form>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.