Merge pull request #13 from jozzhart/master

ProLoser · ProLoser · commit 1b076870bada · 2013-06-22T23:27:00.000-07:00
Implement tinymce 4.x
diff --git a/bower.json b/bower.json
@@ -17,7 +17,7 @@
   ],
   "dependencies": {
     "angular": "~1.x",
-    "tinymce-release": "latest"
+    "tinymce": "git://github.com/jozzhart/tinymce.git#4.0.0"
   },
   "devDependencies": {
     "angular-mocks": "~1.x"
diff --git a/demo/demo.html b/demo/demo.html
@@ -7,10 +7,9 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <title>AngularUI - TinyMCE Demo</title>
-  <base href=".."></base>
-  <script type="text/javascript" src="components/tinymce-release/tiny_mce.js"></script>
-  <script type="text/javascript" src="components/angular/angular.js"></script>
-  <script type="text/javascript" src="src/tinymce.js"></script>
+  <script type="text/javascript" src="../components/tinymce/tinymce.min.js"></script>
+  <script type="text/javascript" src="../components/angular/angular.js"></script>
+  <script type="text/javascript" src="../src/tinymce.js"></script>
 </head>
 <body ng-app="ui.tinymce">
   <form method="post">
diff --git a/src/tinymce.js b/src/tinymce.js
@@ -15,40 +15,27 @@ angular.module('ui.tinymce', [])
           attrs.$set('id', 'uiTinymce' + generatedIds++);
         }
         options = {
-          // Update model on button click
-          onchange_callback: function (inst) {
-            if (inst.isDirty()) {
-              inst.save();
+          // Update model when calling setContent (such as from the source editor popup)
+          setup: function (ed) {
+            ed.on('init', function(args) {
+              ngModel.$render();
+            });
+            // Update model on button click
+            ed.on('ExecCommand', function (e) {
+              ed.save();
               ngModel.$setViewValue(elm.val());
               if (!scope.$$phase) {
                 scope.$apply();
               }
-            }
-          },
-          // Update model on keypress
-          handle_event_callback: function (e) {
-            if (this.isDirty()) {
-              this.save();
+            });
+            // Update model on keypress
+            ed.on('KeyUp', function (e) {
+              console.log(ed.isDirty());
+              ed.save();
               ngModel.$setViewValue(elm.val());
               if (!scope.$$phase) {
                 scope.$apply();
               }
-            }
-            return true; // Continue handling
-          },
-          // Update model when calling setContent (such as from the source editor popup)
-          setup: function (ed) {
-            ed.onInit.add(function(ed) {
-              ngModel.$render();
-            });
-            ed.onSetContent.add(function (ed, o) {
-              if (ed.isDirty()) {
-                ed.save();
-                ngModel.$setViewValue(elm.val());
-                if (!scope.$$phase) {
-                  scope.$apply();
-                }
-              }
             });
           },
           mode: 'exact',
@@ -63,7 +50,7 @@ angular.module('ui.tinymce', [])
         setTimeout(function () {
           tinymce.init(options);
         });
-        
+
 
         ngModel.$render = function() {
           if (!tinyInstance) {
diff --git a/test/test.conf.js b/test/test.conf.js
@@ -4,7 +4,7 @@ files = [
   JASMINE_ADAPTER,
   'components/angular/angular.js',
   'components/angular-mocks/angular-mocks.js',
-  'components/tinymce-release/tiny_mce.js',
+  'components/tinymce/tinymce.min.js',
   'src/tinymce.js',
   'test/*.spec.js'
 ];
