#3594 Fix tests

- Fix JS validation errors - Update help file validation to expect filenames without .md
pkp · Oct 30, 2018 · 3e1bb71 · 3e1bb71
1 parent 3c69ec0
commit 3e1bb71
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 14 deletions.
diff --git a/js/controllers/HelpPanelHandler.js b/js/controllers/HelpPanelHandler.js
@@ -160,6 +160,7 @@
 	 * @param {{
 	 *  caller: jQueryObject,
 	 *  topic: string
+	 *  section: string
 	 *  }} options The options with which to open this handler
 	 */
 	$.pkp.controllers.HelpPanelHandler.prototype.openPanel_ =

diff --git a/js/controllers/SiteHandler.js b/js/controllers/SiteHandler.js
@@ -141,12 +141,14 @@
 					'/plugins/generic/tinymce/plugins/pkpWordcount/plugin.js');
 
 
-			var contentCSS = $.pkp.app.tinyMceContentCSS;
+			var contentCSS = $.pkp.app.tinyMceContentCSS,
+					tinymceParams,
+					tinymceParamDefaults;
 			if ($.pkp.app.cdnEnabled) {
 				contentCSS = contentCSS + ', ' + $.pkp.app.tinyMceContentFont;
 			}
 
-			var tinymceParams, tinymceParamDefaults = {
+			tinymceParamDefaults = {
 				width: '100%',
 				resize: 'both',
 				entity_encoding: 'raw',
@@ -646,7 +648,7 @@
 	 */
 	$.pkp.controllers.SiteHandler.prototype.handleNotifyEvent =
 			function(caller, settings) {
-		pnotify = new PNotify(settings);
+		var pnotify = new PNotify(settings);
 	};
 
 

diff --git a/js/controllers/modal/ModalHandler.js b/js/controllers/modal/ModalHandler.js
@@ -251,9 +251,12 @@
 		$modalElement.removeClass('is_visible');
 		this.trigger('pkpModalClose');
 		setTimeout(function() {
-			if (modalHandler.options.closeCleanVueInstances.length) {
-				for (var i = 0; i < modalHandler.options.closeCleanVueInstances.length; i++) {
-					var id = modalHandler.options.closeCleanVueInstances[i];
+			var vueInstances = modalHandler.options.closeCleanVueInstances,
+					i,
+					id;
+			if (vueInstances.length) {
+				for (i = 0; i < vueInstances.length; i++) {
+					id = vueInstances[i];
 					if (typeof pkp.registry._instances[id] !== 'undefined') {
 						pkp.registry._instances[id].$destroy();
 					}
@@ -328,8 +331,8 @@
 	 * from a child form has been fired, and this form matches the config id
 	 *
 	 * @param {Object} source The Vue.js component which fired the event
-	 * @param {Object} data Data attached to the event, which will include the
-	 *  form id.
+	 * @param {Object} formId The form component's id prop
+	 * @private
 	 */
 	$.pkp.controllers.modal.ModalHandler.prototype.onFormSuccess_ =
 			function(source, formId) {

diff --git a/js/controllers/tab/workflow/WorkflowTabHandler.js b/js/controllers/tab/workflow/WorkflowTabHandler.js
@@ -20,6 +20,7 @@
 	$.pkp.controllers.tab =
 			$.pkp.controllers.tab || {};
 
+
 	/** @type {Object} */
 	$.pkp.controllers.tab.workflow =
 			$.pkp.controllers.tab.workflow || {};

diff --git a/templates/controllers/tab/workflow/editorial.tpl b/templates/controllers/tab/workflow/editorial.tpl
@@ -12,7 +12,7 @@
 	{include file="controllers/notification/inPlaceNotification.tpl" notificationId="editingNotification_"|concat:$submission->getId() requestOptions=$editingNotificationRequestOptions refreshOn="stageStatusUpdated"}
 
 	{* Help Link *}
-	{help file="editorial-workflow/copyediting.md" class="pkp_help_tab"}
+	{help file="editorial-workflow/copyediting" class="pkp_help_tab"}
 
 	<div class="pkp_context_sidebar">
 		{capture assign=copyeditingEditorDecisionsUrl}{url router=$smarty.const.ROUTE_PAGE page="workflow" op="editorDecisionActions" submissionId=$submission->getId() stageId=$stageId escape=false}{/capture}

diff --git a/templates/controllers/tab/workflow/review.tpl b/templates/controllers/tab/workflow/review.tpl
@@ -9,7 +9,7 @@
  *}
 
 {* Help tab *}
-{help file="editorial-workflow/review.md" class="pkp_help_tab"}
+{help file="editorial-workflow/review" class="pkp_help_tab"}
 
 <script type="text/javascript">
 	// Attach the JS file tab handler.

diff --git a/templates/controllers/tab/workflow/submission.tpl b/templates/controllers/tab/workflow/submission.tpl
@@ -9,7 +9,7 @@
  *}
 
 {* Help Link *}
-{help file="editorial-workflow/submission.md" class="pkp_help_tab"}
+{help file="editorial-workflow/submission" class="pkp_help_tab"}
 
 <div class="pkp_context_sidebar">
 	{capture assign=submissionEditorDecisionsUrl}{url router=$smarty.const.ROUTE_PAGE page="workflow" op="editorDecisionActions" submissionId=$submission->getId() stageId=$stageId contextId="submission" escape=false}{/capture}

diff --git a/tools/checkHelp.sh b/tools/checkHelp.sh
@@ -14,8 +14,8 @@
 # Look for help filenames referred to in templates and check that they all exist (in English)
 ERRORS=0
 for filename in `find . -name \*.tpl -exec sed -n -e "s/.*{help[^}]file=\"\([^\"#]\+\)[#\"].*/\1/p" "{}" ";"`; do
-	if [ ! -f docs/manual/en/$filename ]; then
-		echo "Help file \"$filename\" referred to in template does not exist!"
+	if [ ! -f docs/manual/en/$filename.md ]; then
+		echo "Help file \"$filename.md\" referred to in template does not exist!"
 		ERRORS=1
 	fi
 done

diff --git a/tools/closure-externs.js b/tools/closure-externs.js
@@ -269,7 +269,9 @@ plupload.Uploader.prototype.removeFile = function(f) {};
 plupload.Uploader.prototype.bind = function(eventName, f) {};
 
 $.pkp.app = {
-	baseUrl: ''
+	baseUrl: '',
+	tinyMceContentCSS: '',
+	tinyMceContentFont: ''
 };
 
 $.pkp.locale = {