From 578d1533dddad19a955aeb4eb30f3b72b62c5013 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Fri, 11 Jan 2019 16:25:15 -0500
Subject: [PATCH] browser compatibility fix
---
devNotes/twine JS.txt | 28 ++++++++++++----------------
src/js/utilJS.tw | 28 ++++++++++++----------------
2 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index b6929a48cc1..c9dee101ef0 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -4450,24 +4450,20 @@ window.originPronounReplace = function(slave) {
case "She was the private slave of a con artist cult leader before he had to abandon her and flee.":
case "You helped her give birth, leaving her deeply indebted to you.":
case "You purchased her from a King after she expressed knowledge of the prince's affair with another servant.":
- /*
- r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive);
- r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive));
- r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun);
- r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun));
- r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.object);
- r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.object));
- */
+ r = r.replace(/\bherself\b/g, slave.objectReflexive);
+ r = r.replace(/\bHerself\b/g, capFirstChar(slave.objectReflexive));
+ r = r.replace(/\bshe\b/g, slave.pronoun);
+ r = r.replace(/\bShe\b/g, capFirstChar(slave.pronoun));
+ r = r.replace(/\bher\b/g, slave.object);
+ r = r.replace(/\bHer\b/g, capFirstChar(slave.object));
return r;
default:
- /*
- r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive);
- r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive));
- r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun);
- r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun));
- r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.possessive);
- r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.possessive));
- */
+ r = r.replace(/\bherself\b/g, slave.objectReflexive);
+ r = r.replace(/\bHerself\b/g, capFirstChar(slave.objectReflexive));
+ r = r.replace(/\bshe\b/g, slave.pronoun);
+ r = r.replace(/\bShe\b/g, capFirstChar(slave.pronoun));
+ r = r.replace(/\bher\b/g, slave.possessive);
+ r = r.replace(/\bHer\b/g, capFirstChar(slave.possessive));
return r;
}
};
diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index a8f4d647cc0..e06e9ff130c 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -1219,24 +1219,20 @@ window.originPronounReplace = function(slave) {
case "She was the private slave of a con artist cult leader before he had to abandon her and flee.":
case "You helped her give birth, leaving her deeply indebted to you.":
case "You purchased her from a King after she expressed knowledge of the prince's affair with another servant.":
- /*
- r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive);
- r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive));
- r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun);
- r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun));
- r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.object);
- r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.object));
- */
+ r = r.replace(/\bherself\b/g, slave.objectReflexive);
+ r = r.replace(/\bHerself\b/g, capFirstChar(slave.objectReflexive));
+ r = r.replace(/\bshe\b/g, slave.pronoun);
+ r = r.replace(/\bShe\b/g, capFirstChar(slave.pronoun));
+ r = r.replace(/\bher\b/g, slave.object);
+ r = r.replace(/\bHer\b/g, capFirstChar(slave.object));
return r;
default:
- /*
- r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive);
- r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive));
- r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun);
- r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun));
- r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.possessive);
- r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.possessive));
- */
+ r = r.replace(/\bherself\b/g, slave.objectReflexive);
+ r = r.replace(/\bHerself\b/g, capFirstChar(slave.objectReflexive));
+ r = r.replace(/\bshe\b/g, slave.pronoun);
+ r = r.replace(/\bShe\b/g, capFirstChar(slave.pronoun));
+ r = r.replace(/\bher\b/g, slave.possessive);
+ r = r.replace(/\bHer\b/g, capFirstChar(slave.possessive));
return r;
}
};
--
GitLab