From 66b4e02c95f3a13a405b3d40c60eeea085578066 Mon Sep 17 00:00:00 2001
From: Myron Turner <turnermm02@shaw.ca>
Date: Fri, 18 Oct 2019 16:52:04 -0500
Subject: [PATCH 1/2] moves javascript from admin.php to script.js

---
 admin.php       | 65 +++++--------------------------------------------
 plugin.info.txt |  2 +-
 script.js       | 43 ++++++++++++++++++++++++++++++++
 version         |  2 +-
 4 files changed, 51 insertions(+), 61 deletions(-)
 create mode 100755 script.js

diff --git a/admin.php b/admin.php
index 3d85347..fba6958 100644
--- a/admin.php
+++ b/admin.php
@@ -133,11 +133,11 @@ function get_edit_list() {
              ptln("<input type = 'hidden' name='encoded[$macro]' value='$encoded'>");
           }
           if(strlen($subst) > 80) {
-            ptln ("<textarea cols='55' rows='3' name='edit[$macro]' onchange='replace_encode(this)'>$subst</textarea></td></tr>");            
+            ptln ("<textarea cols='55' rows='3' name='edit[$macro]' onchange='ti_replace_encode(this)'>$subst</textarea></td></tr>");            
 
           }
           else {
-            ptln ("<input type='text' size='80' name='edit[$macro]' onchange='replace_encode(this)' value='$subst'></td></tr>");            
+            ptln ("<input type='text' size='80' name='edit[$macro]' onchange='ti_replace_encode(this)' value='$subst'></td></tr>");            
           }
 
       }
@@ -154,83 +154,30 @@ function view_entries() {
       ptln('</table>');
    }
 
-   function js() {
-  
-echo <<<JSFN
-
- <script type="text/javascript">
- //<![CDATA[ 
-    var replace_divs= new Array('macro_add','macro_del','macro_edit','ti_info','macro_list');
-   /**
-    * Edit onChange handler
-    * @param el  input element which has been changed
-    * @desc  if an encode hidden input already exists, its value
-    *        is re-encoded from the text input's value
-    *        If not, a new encoded hidden input is created with the encoded 
-    *        value.  The encode input value is used to substitute the new edit values
-    *        in the php edit() function 
-   */
-    function replace_encode (el) {
-      var matches = el.name.match(/\[(.*)\]/);
-      if(matches[1]) {  
-        var name = 'encoded['+matches[1]+']';
-        var val = el.value;
-        val = val.replace(/>/g,"&gt;"); 
-        val = val.replace(/</g,"&lt;");          
-        if(!el.form[name]) {
-            var encoder = document.createElement('input');           
-            encoder.type = 'hidden';
-            encoder.name = name;
-            encoder.value = encodeURIComponent(val);
-            el.form.appendChild(encoder);  
-        }
-        else if(el.form[name]) { 
-          el.form[name].value = encodeURIComponent(val);
-        }
-      }
-    }
-    
- function ti_getEL(n) {     
-      return document.getElementById(n);      
-  }
-  
- function replace_show(which) {
-    for(var i in replace_divs) {
-      ti_getEL(replace_divs[i]).style.display='none';
-    }
-    ti_getEL(which).style.display='block';
-    ti_getEL('ti_info_btn').style.display='inline';
- }
-//]]> 
- </script>
-JSFN;
-
-   }
     /**
      * output appropriate html
      */
     function html() {
      $this->macros_data = $this->get_macros();
-     $this->js();
       if($this->output) {
         ptln('<pre>' . $this->output . '</pre>');
       }
       ptln('<div style="padding:4px" id="ti_info">');     
       ptln('<div style="text-align:right;">');
-      ptln('<button class="button" style="padding:0px;margin:0px;" onclick="replace_show(\'ti_info_btn\');">');
+      ptln('<button class="button" style="padding:0px;margin:0px;" onclick="ti_replace_show(\'ti_info_btn\');">');
       ptln($this->getLang('hide_info') .'</button>&nbsp;&nbsp;&nbsp;&nbsp;');
       ptln('</div>');
       ptln('<h2>Info</h2>');
       ptln( $this->locale_xhtml('intro') . '</div>');   
      
       ptln('<div style="padding-bottom:8px;">');
-      ptln('<button class="button" onclick="replace_show(\'macro_add\'); ">');
+      ptln('<button class="button" onclick="ti_replace_show(\'macro_add\'); ">');
       ptln($this->getLang('add_macros') .'</button>&nbsp;&nbsp;');
      
-      ptln('<button class="button" onclick="replace_show(\'macro_del\'); ">');
+      ptln('<button class="button" onclick="ti_replace_show(\'macro_del\'); ">');
       ptln($this->getLang('delete_macros') .'</button>&nbsp;&nbsp;');
 
-      ptln('<button class="button" onclick="replace_show(\'macro_edit\'); ">');
+      ptln('<button class="button" onclick="ti_replace_show(\'macro_edit\'); ">');
       ptln($this->getLang('edit_macros') .'</button>&nbsp;&nbsp;');
 
       ptln('<button class="button" onclick="ti_getEL(\'macro_list\').style.display=\'block\';ti_getEL(\'macro_list\').scrollIntoView();">');
diff --git a/plugin.info.txt b/plugin.info.txt
index ae031d0..9717c5b 100644
--- a/plugin.info.txt
+++ b/plugin.info.txt
@@ -1,7 +1,7 @@
 base textinsert
 author Myron Turner
 email turnermm02@shaw.ca
-date 2019-10-03
+date 2019-10-18
 name textinsert Plugin
 desc replace macros with text subsitutions 
 url https://www.dokuwiki.org/plugin:textinsert
diff --git a/script.js b/script.js
new file mode 100755
index 0000000..3748460
--- /dev/null
+++ b/script.js
@@ -0,0 +1,43 @@
+
+ var ti_replace_divs = new Array('macro_add','macro_del','macro_edit','ti_info','macro_list');
+  /**
+    * Edit onChange handler
+    * @param el  input element which has been changed
+    * @desc  if an encode hidden input already exists, its value
+    *        is re-encoded from the text input's value
+    *        If not, a new encoded hidden input is created with the encoded 
+    *        value.  The encode input value is used to substitute the new edit values
+    *        in the php edit() function 
+   */
+    function ti_replace_encode (el) {
+      var matches = el.name.match(/\[(.*)\]/);
+      if(matches[1]) {  
+        var name = 'encoded['+matches[1]+']';
+        var val = el.value;
+        val = val.replace(/>/g,"&gt;"); 
+        val = val.replace(/</g,"&lt;");          
+        if(!el.form[name]) {
+            var encoder = document.createElement('input');           
+            encoder.type = 'hidden';
+            encoder.name = name;
+            encoder.value = encodeURIComponent(val);
+            el.form.appendChild(encoder);  
+        }
+        else if(el.form[name]) { 
+          el.form[name].value = encodeURIComponent(val);
+        }
+      }
+    }
+ 
+  function ti_replace_show(which) {
+    for(var i in ti_replace_divs) {
+      ti_getEL(ti_replace_divs[i]).style.display='none';
+    }
+    ti_getEL(which).style.display='block';
+    ti_getEL('ti_info_btn').style.display='inline';
+ }
+ 
+     
+ function ti_getEL(n) {     
+      return document.getElementById(n);      
+  }
\ No newline at end of file
diff --git a/version b/version
index 4fb8186..236d28e 100644
--- a/version
+++ b/version
@@ -1,2 +1,2 @@
-19-Oct_03-20_19
+js_inline_19-Oct_18-16_44
 

From 0dd5aeef8a32c5a2d6250297c4651d83a3f3931e Mon Sep 17 00:00:00 2001
From: Myron Turner <turnermm02@shaw.ca>
Date: Fri, 18 Oct 2019 16:54:58 -0500
Subject: [PATCH 2/2] moves javascript from admin.php to script.js

---
 version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version b/version
index 236d28e..1126dff 100644
--- a/version
+++ b/version
@@ -1,2 +1,2 @@
-js_inline_19-Oct_18-16_44
+js_file_19-Oct_18-16_54