From 93ebdf724b9cd051b3bfb3bd1dcc748b0c7fb714 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Wed, 9 Mar 2016 22:54:18 +0000
Subject: [PATCH] Changed direct attributes to prevent conflicts

---
 resources/assets/js/directives.js    | 9 +++++----
 resources/views/pages/form.blade.php | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js
index b6c41bb3c..dee02ab40 100644
--- a/resources/assets/js/directives.js
+++ b/resources/assets/js/directives.js
@@ -167,18 +167,19 @@ module.exports = function (ngApp, events) {
             restrict: 'A',
             scope: {
                 tinymce: '=',
-                ngModel: '=',
-                ngChange: '='
+                mceModel: '=',
+                mceChange: '='
             },
             link: function (scope, element, attrs) {
 
                 function tinyMceSetup(editor) {
                     editor.on('keyup', (e) => {
                         var content = editor.getContent();
+                        console.log(content);
                         scope.$apply(() => {
-                            scope.ngModel = content;
+                            scope.mceModel = content;
                         });
-                        scope.ngChange(content);
+                        scope.mceChange(content);
                     });
                 }
 
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index e32ef537a..f406247d7 100644
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -31,7 +31,7 @@
         </div>
     </div>
     <div class="edit-area flex-fill flex">
-        <textarea id="html-editor" tinymce="editorOptions" ng-change="editorChange" ng-model="editorHtml" name="html" rows="5"
+        <textarea id="html-editor" tinymce="editorOptions" mce-change="editorChange" mce-model="editorHtml"  name="html" rows="5"
                   @if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
         @if($errors->has('html'))
             <div class="text-neg text-small">{{ $errors->first('html') }}</div>