Merge pull request #59 from douglasduteil/refacto-back-to-postLink

refacto: move back the instantiation in postLink

Author: douglasduteil

package.json

@@ -8,7 +8,7 @@
   "main": "./ui-codemirror.js",
   "dependencies": {},
   "devDependencies": {
-    "angular-ui-publisher": "1.2.x",
+    "angular-ui-publisher": "angular-ui/angular-ui-publisher#06e016272e0064eb030f52cffbe00daa48b56e20",
     "grunt": "~0.4.2",
     "grunt-contrib-connect": "~0.7.0",
     "grunt-contrib-copy": "~0.5.0",

src/ui-codemirror.js

@@ -11,39 +11,32 @@ angular.module('ui.codemirror', [])
       restrict: 'EA',
       require: '?ngModel',
       priority: 1,
-      compile: function compile(tElement) {
+      compile: function compile() {
 
         // Require CodeMirror
         if (angular.isUndefined(window.CodeMirror)) {
           throw new Error('ui-codemirror need CodeMirror to work... (o rly?)');
         }
 
-        // Create a codemirror instance with
-        // - the function that will to place the editor into the document.
-        // - the initial content of the editor.
-        //   see http://codemirror.net/doc/manual.html#api_constructor
-        var value = tElement.text();
-        var codeMirror = new window.CodeMirror(function (cm_el) {
+        return function postLink(scope, iElement, iAttrs, ngModel) {
 
-          angular.forEach(tElement.prop('attributes'), function (a) {
-            if (a.name === 'ui-codemirror') {
-              cm_el.setAttribute('ui-codemirror-opts', a.textContent);
-            } else {
-              cm_el.setAttribute(a.name, a.textContent);
-            }
-          });
-
-          // FIX replaceWith throw not parent Error !
-          if (tElement.parent().length <= 0) {
-            tElement.wrap('<div>');
-          }
 
-          tElement.replaceWith(cm_el);
-        }, {value: value});
+          var options, opts, codeMirror, value;
 
-        return  function postLink(scope, iElement, iAttrs, ngModel) {
+          value = iElement.text();
 
-          var options, opts;
+          if (iElement[0].tagName === 'TEXTAREA') {
+            codeMirror = window.CodeMirror.fromTextArea(iElement[0], {
+              value: value
+            });
+          } else {
+            iElement.html('');
+            codeMirror = new window.CodeMirror(function(cm_el) {
+              iElement.replaceWith(cm_el);
+            }, {
+              value: value
+            });
+          }
 
           options = uiCodemirrorConfig.codemirror || {};
           opts = angular.extend({}, options, scope.$eval(iAttrs.uiCodemirror), scope.$eval(iAttrs.uiCodemirrorOpts));
@@ -58,7 +51,7 @@ angular.module('ui.codemirror', [])
 
           updateOptions(opts);
 
-          if (angular.isDefined(scope.$eval(iAttrs.uiCodemirror))) {
+          if (iAttrs.uiCodemirror) {
             scope.$watch(iAttrs.uiCodemirror, updateOptions, true);
           }
 
@@ -69,8 +62,7 @@ angular.module('ui.codemirror', [])
             ngModel.$formatters.push(function (value) {
               if (angular.isUndefined(value) || value === null) {
                 return '';
-              }
-              else if (angular.isObject(value) || angular.isArray(value)) {
+              } else if (angular.isObject(value) || angular.isArray(value)) {
                 throw new Error('ui-codemirror cannot use an object or an array as a model');
               }
               return value;
@@ -105,7 +97,7 @@ angular.module('ui.codemirror', [])
             scope.$watch(iAttrs.uiRefresh, function (newVal, oldVal) {
               // Skip the initial watch firing
               if (newVal !== oldVal) {
-                  codeMirror.refresh();
+                codeMirror.refresh();
               }
             });
           }
@@ -126,6 +118,7 @@ angular.module('ui.codemirror', [])
           if (angular.isFunction(opts.onLoad)) {
             opts.onLoad(codeMirror);
           }
+
         };
       }
     };

test/codemirror.spec.js

@@ -87,7 +87,7 @@ describe('uiCodemirror', function () {
     });
 
     it('should replace the element with a div.CodeMirror', function () {
-      // Explicit a parent node to support the scope.
+      // Explicit a parent node to support the directive.
       var element = $compile('<div><div ui-codemirror></div></div>')(scope).children();
 
       expect(element).toBeDefined();
@@ -189,31 +189,29 @@ describe('uiCodemirror', function () {
 
 
     it('when the IDE changes should update the model', function () {
-      // Explicit a parent node to support the scope.
-      var element = $compile('<div><div ui-codemirror ng-model="foo"></div></div>')(scope).children();
+      var element = $compile('<div ui-codemirror ng-model="foo"></div>')(scope);
 
       expect(element).toBeDefined();
-      expect(element.attr('class')).toEqual('CodeMirror cm-s-default ng-pristine ng-valid');
+      expect(element.attr('class')).toEqual('ng-scope ng-pristine ng-valid');
 
       var value = 'baz';
       codemirror.setValue(value);
       expect(scope.foo).toBe(value);
 
-      expect(element.attr('class')).toEqual('CodeMirror cm-s-default ng-valid ng-dirty');
+      expect(element.attr('class')).toEqual('ng-scope ng-valid ng-dirty');
 
     });
 
     it('when the model changes should update the IDE', function () {
-      // Explicit a parent node to support the scope.
-      var element = $compile('<div><div ui-codemirror ng-model="foo"></div></div>')(scope).children();
+      var element = $compile('<div ui-codemirror ng-model="foo"></div>')(scope);
 
       expect(element).toBeDefined();
-      expect(element.attr('class')).toEqual('CodeMirror cm-s-default ng-pristine ng-valid');
+      expect(element.attr('class')).toEqual('ng-scope ng-pristine ng-valid');
 
       scope.$apply('foo = "bar"');
       expect(codemirror.getValue()).toBe(scope.foo);
 
-      expect(element.attr('class')).toEqual('CodeMirror cm-s-default ng-pristine ng-valid');
+      expect(element.attr('class')).toEqual('ng-scope ng-pristine ng-valid');
     });
 
 
@@ -309,4 +307,4 @@ describe('uiCodemirror', function () {
     expect(compileWithArray).toThrow();
   });
 
-});
+});