Mode options compatibility

fxmontigny · Dec 26, 2016 · 5fedd37 · 5fedd37
1 parent 561b731
commit 5fedd37
Show file tree

Hide file tree

Showing 9 changed files with 176 additions and 148 deletions.
diff --git a/bundles/ng2-ace-editor.js b/bundles/ng2-ace-editor.js
@@ -34,7 +34,7 @@ System.registerDynamic("src/directive", ["@angular/core", "brace", "brace/theme/
         AceEditorDirective.prototype.init = function () {
             this.editor.setOptions(this._options || {});
             this.editor.setTheme("ace/theme/" + this._theme);
-            this.editor.getSession().setMode("ace/mode/" + this._mode);
+            this.mode = this._mode;
             this.editor.setReadOnly(this._readOnly);
         };
         AceEditorDirective.prototype.initEvents = function () {
@@ -73,7 +73,11 @@ System.registerDynamic("src/directive", ["@angular/core", "brace", "brace/theme/
         Object.defineProperty(AceEditorDirective.prototype, "mode", {
             set: function (mode) {
                 this._mode = mode;
-                this.editor.getSession().setMode("ace/mode/" + mode);
+                if (typeof this.mode == 'object') {
+                    this.editor.getSession().setMode(this._mode);
+                } else {
+                    this.editor.getSession().setMode("ace/mode/" + this._mode);
+                }
             },
             enumerable: true,
             configurable: true
@@ -104,18 +108,18 @@ System.registerDynamic("src/directive", ["@angular/core", "brace", "brace/theme/
             enumerable: true,
             configurable: true
         });
-        __decorate([core_1.Output('textChanged'), __metadata('design:type', Object)], AceEditorDirective.prototype, "textChanged", void 0);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorDirective.prototype, "options", null);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorDirective.prototype, "readOnly", null);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorDirective.prototype, "theme", null);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorDirective.prototype, "mode", null);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorDirective.prototype, "text", null);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorDirective.prototype, "autoUpdateContent", null);
-        AceEditorDirective = __decorate([core_1.Directive({
-            selector: '[ace-editor]'
-        }), __metadata('design:paramtypes', [core_1.ElementRef])], AceEditorDirective);
         return AceEditorDirective;
     }();
+    __decorate([core_1.Output('textChanged'), __metadata("design:type", Object)], AceEditorDirective.prototype, "textChanged", void 0);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorDirective.prototype, "options", null);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorDirective.prototype, "readOnly", null);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorDirective.prototype, "theme", null);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorDirective.prototype, "mode", null);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorDirective.prototype, "text", null);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorDirective.prototype, "autoUpdateContent", null);
+    AceEditorDirective = __decorate([core_1.Directive({
+        selector: '[ace-editor]'
+    }), __metadata("design:paramtypes", [core_1.ElementRef])], AceEditorDirective);
     exports.AceEditorDirective = AceEditorDirective;
     return module.exports;
 });
@@ -219,7 +223,11 @@ System.registerDynamic("src/component", ["@angular/core", "brace", "brace/theme/
         });
         AceEditorComponent.prototype.setMode = function (mode) {
             this._mode = mode;
-            this._editor.getSession().setMode("ace/mode/" + mode);
+            if (typeof this._mode == 'object') {
+                this._editor.getSession().setMode(this._mode);
+            } else {
+                this._editor.getSession().setMode("ace/mode/" + this._mode);
+            }
         };
         Object.defineProperty(AceEditorComponent.prototype, "text", {
             set: function (text) {
@@ -259,34 +267,34 @@ System.registerDynamic("src/component", ["@angular/core", "brace", "brace/theme/
         AceEditorComponent.prototype.getEditor = function () {
             return this._editor;
         };
-        __decorate([core_1.Output('textChanged'), __metadata('design:type', Object)], AceEditorComponent.prototype, "textChanged", void 0);
-        __decorate([core_1.Input('style'), __metadata('design:type', Object)], AceEditorComponent.prototype, "style", void 0);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorComponent.prototype, "options", null);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorComponent.prototype, "readOnly", null);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorComponent.prototype, "theme", null);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorComponent.prototype, "mode", null);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorComponent.prototype, "text", null);
-        __decorate([core_1.Input(), __metadata('design:type', Object), __metadata('design:paramtypes', [Object])], AceEditorComponent.prototype, "autoUpdateContent", null);
-        __decorate([core_1.Input(), __metadata('design:type', Number), __metadata('design:paramtypes', [Number])], AceEditorComponent.prototype, "durationBeforeCallback", null);
-        AceEditorComponent = __decorate([core_1.Component({
-            selector: 'ace-editor',
-            template: '',
-            styles: [':host { display:block;width:100%; }']
-        }), __metadata('design:paramtypes', [core_1.ElementRef])], AceEditorComponent);
         return AceEditorComponent;
     }();
+    __decorate([core_1.Output('textChanged'), __metadata("design:type", Object)], AceEditorComponent.prototype, "textChanged", void 0);
+    __decorate([core_1.Input('style'), __metadata("design:type", Object)], AceEditorComponent.prototype, "style", void 0);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorComponent.prototype, "options", null);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorComponent.prototype, "readOnly", null);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorComponent.prototype, "theme", null);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorComponent.prototype, "mode", null);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorComponent.prototype, "text", null);
+    __decorate([core_1.Input(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], AceEditorComponent.prototype, "autoUpdateContent", null);
+    __decorate([core_1.Input(), __metadata("design:type", Number), __metadata("design:paramtypes", [Number])], AceEditorComponent.prototype, "durationBeforeCallback", null);
+    AceEditorComponent = __decorate([core_1.Component({
+        selector: 'ace-editor',
+        template: '',
+        styles: [':host { display:block;width:100%; }']
+    }), __metadata("design:paramtypes", [core_1.ElementRef])], AceEditorComponent);
     exports.AceEditorComponent = AceEditorComponent;
     return module.exports;
 });
-System.registerDynamic('ng2-ace-editor', ['./src/directive', './src/component'], true, function ($__require, exports, module) {
+System.registerDynamic("ng2-ace-editor", ["./src/directive", "./src/component"], true, function ($__require, exports, module) {
   "use strict";
 
   var define,
       global = this || self,
       GLOBAL = global;
-  var directive_1 = $__require('./src/directive');
+  var directive_1 = $__require("./src/directive");
   exports.AceEditorDirective = directive_1.AceEditorDirective;
-  var component_1 = $__require('./src/component');
+  var component_1 = $__require("./src/component");
   exports.AceEditorComponent = component_1.AceEditorComponent;
   return module.exports;
 });
diff --git a/ng2-ace-editor.js b/ng2-ace-editor.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng2-ace-editor",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Ace editor integration with typescript for angular 2.",
   "main": "ng2-ace-editor.js",
   "typings": "ng2-ace-editor.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/fxmontigny/ng2-ace-editor.git"
+    "url": "git+https://github.com/ckiffel/ng2-ace-editor.git"
   },
   "keywords": [
     "ng2",
@@ -24,10 +24,10 @@
     "ng2-ace",
     "angular2-ace"
   ],
-  "author": "François-Xavier Montigny <fxaviermontigny@gmail.com>",
+  "author": "Christophe KIFFEL <christophe.kiffel@gmail.com>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/fxmontigny/ng2-ace-editor/issues"
+    "url": "https://github.com/ckiffel/ng2-ace-editor/issues"
   },
   "dependencies": {
     "ace-builds": "^1.2.5",

diff --git a/src/component.d.ts b/src/component.d.ts
@@ -8,7 +8,7 @@ export declare class AceEditorComponent {
     _options: any;
     _readOnly: boolean;
     _theme: string;
-    _mode: string;
+    _mode: any;
     _autoUpdateContent: boolean;
     _editor: any;
     _durationBeforeCallback: number;