Replace MessageEvent with ajax call in reader setup

Author: phillip-hopper

.gitignore

@@ -1,10 +1,10 @@
 src/Bloom.suo
 *.user
-lib/GeckoFx/Skybound.Gecko/*
-output/*
+lib/GeckoFx/Skybound.Gecko/
+output/
 */.svn
-*/bin/*
-*/obj
+bin/
+obj/
 userProject
 templates/A4LandscapeBooklet/starter.pdf
 src/_ReSharper.Bloom/*
@@ -89,6 +89,6 @@ DistFiles/ReleaseNotes.html
 ReadMe_*.html
 B3.sln
 B2.sln
-node_modules/*
+node_modules/
 *.usertasks
 Andika-R.ttf

src/BloomBrowserUI/bookEdit/readerSetup/readerSetup.ui.js

@@ -610,20 +610,6 @@ function firstSetupLetters(): boolean {
 	return false;
 }
 
-/**
- * Fires an event for C# to handle.
- * The listeners in C# are set up in EditingModel.cs, in the function "DocumentCompleted()", and using this
- * syntax: _view.AddMessageEventListener("nameOfEvent", FunctionThatHandlesTheEvent);
- * @param {String} eventName
- * @param {String} eventData Note: use JSON.stringify if passing object data.
- */
-function fireCSharpSetupEvent(eventName: string, eventData: any) {
-
-	//noinspection TaskProblemsInspection
-	var event = new MessageEvent(eventName, {'view' : window, 'bubbles' : true, 'cancelable' : true, 'data' : eventData});
-	document.dispatchEvent(event);
-}
-
 /**
  * Event handlers
  *
@@ -636,7 +622,7 @@ function attachEventHandlers(): void {
 	if (typeof ($) === "function") {
 
 		$("#open-text-folder").onOnce('click', function() {
-			fireCSharpSetupEvent('openTextsFolderEvent', 'open');
+			getIframeChannel().simpleAjaxNoCallback('/bloom/readers/openTextsFolder');
 			return false;
 		});
 

src/BloomBrowserUI/bookEdit/readerSetup/readerSetup.ui.ts

@@ -565,7 +565,6 @@ void OnIdleAfterDocumentSupposedlyCompleted(object sender, EventArgs e)
 			}
 			// listen for events raised by javascript
 			_view.AddMessageEventListener("saveAccordionSettingsEvent", SaveAccordionSettings);
-			_view.AddMessageEventListener("openTextsFolderEvent", OpenTextsFolder);
 			_view.AddMessageEventListener("setModalStateEvent", SetModalState);
 			_view.AddMessageEventListener("preparePageForEditingAfterOrigamiChangesEvent", PreparePageForEditingAfterOrigamiChanges);
 		}
@@ -695,16 +694,6 @@ private static string CleanUpJsonDataForJavascript(string jsonData)
 			return CleanUpDataForJavascript(jsonData);
 		}
 
-		/// <summary>Opens Explorer (or Linux equivalent) displaying the contents of the Sample Texts directory</summary>
-		/// <param name="arg">Not Used, but required because it is being called by a javascrip MessageEvent</param>
-		private void OpenTextsFolder(string arg)
-		{
-			if (_collectionSettings.SettingsFilePath == null) return;
-			var path = Path.Combine(Path.GetDirectoryName(_collectionSettings.SettingsFilePath), "Sample Texts");
-			if (!Directory.Exists(path)) Directory.CreateDirectory(path);
-			Process.Start(path);
-		}
-
 		private string MakeAccordionContent()
 		{
 			var path = FileLocator.GetFileDistributedWithApplication("BloomBrowserUI/bookEdit/accordion", "Accordion.htm");

src/BloomExe/Edit/EditingModel.cs

@@ -81,6 +81,12 @@ public static bool HandleRequest(string localPath, IRequestInfo info, Collection
 					info.ContentType = "text/plain";
 					info.WriteCompleteOutput("OK");
 					return true;
+
+				case "openTextsFolder":
+					OpenTextsFolder();
+					info.ContentType = "text/plain";
+					info.WriteCompleteOutput("OK");
+					return true;
 			}
 
 			return false;
@@ -275,5 +281,13 @@ private static string SaveReaderToolsWordsFile(string jsonString)
 
 			return "OK";
 		}
+
+		private static void OpenTextsFolder()
+		{
+			if (CurrentBook.CollectionSettings.SettingsFilePath == null) return;
+			var path = Path.Combine(Path.GetDirectoryName(CurrentBook.CollectionSettings.SettingsFilePath), "Sample Texts");
+			if (!Directory.Exists(path)) Directory.CreateDirectory(path);
+			Process.Start(path);
+		}
 	}
 }