From dec9b4709fe65df16eae27cb1bdb2f73b531911f Mon Sep 17 00:00:00 2001
From: yama <yamamoto@kyms.jp>
Date: Fri, 31 Oct 2014 07:40:48 +0900
Subject: [PATCH 1/2] Refactor

---
 install/assets/plugins/systemField_plugin.tpl | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/install/assets/plugins/systemField_plugin.tpl b/install/assets/plugins/systemField_plugin.tpl
index 20af548..3a3daf5 100644
--- a/install/assets/plugins/systemField_plugin.tpl
+++ b/install/assets/plugins/systemField_plugin.tpl
@@ -24,6 +24,7 @@ Configurtion:
 */
 
 defined('IN_MANAGER_MODE') or die();
+if ($modx->event->name !== 'OnDocFormRender') return;
 
 if(empty($separator)) $separator = '<!-- hr -->';
 if(empty($open_text)) $open_text = 'system content';
@@ -31,10 +32,6 @@ if(empty($position)) $position = 'after';
 
 $get_action = isset($_GET['a']) ? $_GET['a'] : 27;
 
-$e = &$modx->Event;
-
-if ($e->name == 'OnDocFormRender') {
-
 $output = <<< OUT
 
 <!-- systemField -->
@@ -148,6 +145,4 @@ window.addEvent('domready', function(){
 
 OUT;
 
-$e->output($output);
-
-}
+$modx->event->output($output);

From af14e1040bfac92cda15dfd8b131411610aba4b8 Mon Sep 17 00:00:00 2001
From: yama <yamamoto@kyms.jp>
Date: Fri, 31 Oct 2014 08:11:09 +0900
Subject: [PATCH 2/2] Refactor

---
 assets/plugins/systemField.js.inc             | 108 +++++++++++++++
 install/assets/plugins/systemField_plugin.tpl | 129 ++----------------
 2 files changed, 121 insertions(+), 116 deletions(-)
 create mode 100644 assets/plugins/systemField.js.inc

diff --git a/assets/plugins/systemField.js.inc b/assets/plugins/systemField.js.inc
new file mode 100644
index 0000000..10df3af
--- /dev/null
+++ b/assets/plugins/systemField.js.inc
@@ -0,0 +1,108 @@
+<!-- systemField -->
+<script type="text/javascript">
+
+var SFloadAction = navigator.userAgent.indexOf('AppleWebKit')>-1 ? 'load' : 'domready';
+var SFposition = '[+position+]';
+
+//window.addEvent(SFloadAction, function(){
+  
+  var SFseparator = '[+separator+]';
+  var SFsourceContentField = $('ta');
+  var SFsaveButton = $('Button1').getFirst('a');
+  var SFcontent = SFsourceContentField.value;
+  var SFsepPos = SFcontent.indexOf(SFseparator);
+  
+  function SFonSaveContent(){
+    /*
+    if(typeof(tinyMCE)!='undefined'){
+      var SFoutContent = tinyMCE.get('ta').getContent()+SFseparator+SFtextarea.value;
+      tinyMCE.get('ta').setContent(SFoutContent,{format : 'html'});
+    }else{
+    */
+      if(SFtextarea.value.length>0){
+        if(SFposition=='after')
+          SFsourceContentField.value += SFseparator+SFtextarea.value;
+        else
+          SFsourceContentField.value = $('SFcontent').value+SFseparator+SFsourceContentField.value;
+      }
+    //}
+  }
+  
+  if(SFsepPos>-1){
+    var SFsystemValue = SFposition=='after' ? SFcontent.substr(SFsepPos+SFseparator.length) : SFcontent.substr(0,SFsepPos);
+    SFsourceContentField.value = SFposition=='after' ? SFcontent.substr(0,SFsepPos) : SFcontent.substr(SFsepPos+SFseparator.length);
+  }else{
+    var SFsystemValue = '';
+  }
+  
+  var SFlinkOpen = new Element('a',{
+    href: '#open',
+    events: {
+      click: function(){
+        if(SFtextarea.style.display=='none')
+          SFtextarea.style.display='inline';
+        else
+          SFtextarea.style.display='none';
+        return false;
+      }
+    },
+    styles: {display:'block', margin: '10px 0'}
+  });
+  var br = new Element('br');
+  var SFtextarea = new Element('textarea',{
+    cols: 300,
+    rows: 12,
+    id: 'SFcontent',
+    styles: {width: '400px', height: '200px', display: 'none'},
+    value: SFsystemValue
+  });
+  
+  $('ta').getParent().adopt(SFlinkOpen.appendText('[+open_text+]'),SFtextarea);
+  
+  if($('which_editor')!=null){
+    $('which_editor')
+    .removeEvents('change')
+    .removeProperty('onchange')
+    .addEvent('change',function(){
+        documentDirty=false;
+      	document.mutate.a.value = [+get_action+];
+        document.mutate.newtemplate.value = $('template').value;
+      	document.mutate.which_editor.value = this.value;
+        document.mutate.mode.value = 4; 
+        SFsubmit();
+    });
+  }
+  
+  $('template')
+  .removeEvents('change')
+  .removeProperty('onchange')
+  .addEvent('change',function(){
+    documentDirty=false;
+		document.mutate.a.value = [+get_action+];
+		document.mutate.newtemplate.value = this.value;
+		SFsubmit();
+  });
+  
+//});
+window.addEvent('domready', function(){
+  if(navigator.userAgent.indexOf('MSIE')>-1 && navigator.userAgent.indexOf('MSIE 9')==-1) {
+    $('mutate').addEvent('submit',SFonSaveContent);
+    SFsubmit = function(){document.mutate.save.click();}
+  }else{
+    SFsubmit = function(){
+      $('mutate').addEvent('submit',SFonSaveContent);
+      document.mutate.save.click();
+    }
+  }
+  
+  SFsaveButton
+  .removeEvents('click')
+  .removeProperty('onclick')
+  .addEvent('click',function(){
+    documentDirty = false;
+    SFsubmit();
+    return false;
+  });
+});
+</script>
+<!-- /systemField -->
diff --git a/install/assets/plugins/systemField_plugin.tpl b/install/assets/plugins/systemField_plugin.tpl
index 3a3daf5..caf83b1 100644
--- a/install/assets/plugins/systemField_plugin.tpl
+++ b/install/assets/plugins/systemField_plugin.tpl
@@ -28,121 +28,18 @@ if ($modx->event->name !== 'OnDocFormRender') return;
 
 if(empty($separator)) $separator = '<!-- hr -->';
 if(empty($open_text)) $open_text = 'system content';
-if(empty($position)) $position = 'after';
-
-$get_action = isset($_GET['a']) ? $_GET['a'] : 27;
-
-$output = <<< OUT
-
-<!-- systemField -->
-<script type="text/javascript">
-
-var SFloadAction = navigator.userAgent.indexOf('AppleWebKit')>-1 ? 'load' : 'domready';
-var SFposition = '{$position}';
-
-//window.addEvent(SFloadAction, function(){
-  
-  var SFseparator = '{$separator}';
-  var SFsourceContentField = $('ta');
-  var SFsaveButton = $('Button1').getFirst('a');
-  var SFcontent = SFsourceContentField.value;
-  var SFsepPos = SFcontent.indexOf(SFseparator);
-  
-  function SFonSaveContent(){
-    /*
-    if(typeof(tinyMCE)!='undefined'){
-      var SFoutContent = tinyMCE.get('ta').getContent()+SFseparator+SFtextarea.value;
-      tinyMCE.get('ta').setContent(SFoutContent,{format : 'html'});
-    }else{
-    */
-      if(SFtextarea.value.length>0){
-        if(SFposition=='after')
-          SFsourceContentField.value += SFseparator+SFtextarea.value;
-        else
-          SFsourceContentField.value = $('SFcontent').value+SFseparator+SFsourceContentField.value;
-      }
-    //}
-  }
-  
-  if(SFsepPos>-1){
-    var SFsystemValue = SFposition=='after' ? SFcontent.substr(SFsepPos+SFseparator.length) : SFcontent.substr(0,SFsepPos);
-    SFsourceContentField.value = SFposition=='after' ? SFcontent.substr(0,SFsepPos) : SFcontent.substr(SFsepPos+SFseparator.length);
-  }else{
-    var SFsystemValue = '';
-  }
-  
-  var SFlinkOpen = new Element('a',{
-    href: '#open',
-    events: {
-      click: function(){
-        if(SFtextarea.style.display=='none')
-          SFtextarea.style.display='inline';
-        else
-          SFtextarea.style.display='none';
-        return false;
-      }
-    },
-    styles: {display:'block', margin: '10px 0'}
-  });
-  var br = new Element('br');
-  var SFtextarea = new Element('textarea',{
-    cols: 300,
-    rows: 12,
-    id: 'SFcontent',
-    styles: {width: '400px', height: '200px', display: 'none'},
-    value: SFsystemValue
-  });
-  
-  $('ta').getParent().adopt(SFlinkOpen.appendText('{$open_text}'),SFtextarea);
-  
-  if($('which_editor')!=null){
-    $('which_editor')
-    .removeEvents('change')
-    .removeProperty('onchange')
-    .addEvent('change',function(){
-        documentDirty=false;
-      	document.mutate.a.value = {$get_action};
-        document.mutate.newtemplate.value = $('template').value;
-      	document.mutate.which_editor.value = this.value;
-        document.mutate.mode.value = 4; 
-        SFsubmit();
-    });
-  }
-  
-  $('template')
-  .removeEvents('change')
-  .removeProperty('onchange')
-  .addEvent('change',function(){
-    documentDirty=false;
-		document.mutate.a.value = {$get_action};
-		document.mutate.newtemplate.value = this.value;
-		SFsubmit();
-  });
-  
-//});
-window.addEvent('domready', function(){
-  if(navigator.userAgent.indexOf('MSIE')>-1 && navigator.userAgent.indexOf('MSIE 9')==-1) {
-    $('mutate').addEvent('submit',SFonSaveContent);
-    SFsubmit = function(){document.mutate.save.click();}
-  }else{
-    SFsubmit = function(){
-      $('mutate').addEvent('submit',SFonSaveContent);
-      document.mutate.save.click();
-    }
-  }
-  
-  SFsaveButton
-  .removeEvents('click')
-  .removeProperty('onclick')
-  .addEvent('click',function(){
-    documentDirty = false;
-    SFsubmit();
-    return false;
-  });
-});
-</script>
-<!-- /systemField -->
-
-OUT;
+if(empty($position))  $position  = 'after';
+
+$ph['separator']  = $separator;
+$ph['open_text']  = $open_text;
+$ph['position']   = $position;
+$ph['get_action'] = isset($_GET['a']) ? $_GET['a'] : 27;;
+$output = file_get_contents(MODX_BASE_PATH . 'assets/plugins/systemField/systemField.js.inc');
+
+foreach($ph as $k=>$v)
+{
+	$k = "[+{$k}+]";
+	$output = str_replace($k,$v,$output);
+}
 
 $modx->event->output($output);