@osovitny/anatoly 1.2.0 → 1.2.2

package/bundles/osovitny-anatoly.umd.js

@@ -991,6 +991,9 @@
             if (typeof name === 'undefined' || name == '') {
                 return false;
             }
+            if (!this.formGroup) {
+                return false;
+            }
             if (this.formGroup.get(name)) {
                 return (this.formSubmitted && this.formGroup.get(name).invalid) ||
                     (this.formGroup.get(name).touched && this.formGroup.get(name).invalid);
@@ -1185,12 +1188,6 @@
     }(ValidationSummaryComponent));
 
     var ɵ0 = function (images) {
-        //let editor = this;
-        //alert("image.beforeUpload uploadType: " + editor.opts.imageUploadParams.uploadType + "_" + editor.opts.imageUploadParams.uploadParentId)
-    }, ɵ1 = function () {
-    }, ɵ2 = function () {
-        var editor = this;
-        //alert('contentChanged');
     };
     var DefaultEditorOptions = {
         placeholderText: 'Edit Your Content Here',
@@ -1222,11 +1219,8 @@
         imageUploadURL: '/api/HtmlEditor/UploadImage',
         imageAllowedTypes: ['jpeg', 'jpg', 'png'],
         imageUploadParams: { uploadType: '', uploadParentId: '' },
-        //Events
         events: {
-            'image.beforeUpload': ɵ0,
-            'initialized': ɵ1,
-            'contentChanged': ɵ2
+            'image.beforeUpload': ɵ0
         }
     };
 
@@ -1245,21 +1239,18 @@
       Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
     </file>
     */
-    var HtmlEditorComponent = /** @class */ (function (_super) {
-        __extends(HtmlEditorComponent, _super);
-        function HtmlEditorComponent() {
-            var _this = _super !== null && _super.apply(this, arguments) || this;
-            _this._editorInitialized = false;
+    var BaseHtmlEditorComponent = /** @class */ (function (_super) {
+        __extends(BaseHtmlEditorComponent, _super);
+        function BaseHtmlEditorComponent() {
+            var _this = _super.call(this) || this;
+            _this.editorInitialized = false;
             //General params
             _this.editorId = '';
             _this.editorLabelText = 'Html';
             _this.editorOptions = {};
-            //Form based params
-            _this.isFormBased = '1';
-            _this.editorFormKey = 'html';
             return _this;
         }
-        HtmlEditorComponent.prototype.ngOnInit = function () {
+        BaseHtmlEditorComponent.prototype.ngOnInit = function () {
             var opt = this.editorOptions;
             if (typeof this.editorOptions == "string") {
                 opt = JSON.parse(this.editorOptions);
@@ -1267,30 +1258,33 @@
             var newOptions = $.extend({}, DefaultEditorOptions, opt);
             var key = window.__froalaEditor_Key;
             if (key) {
-                newOptions = $.extend({}, JSON.parse('{ "key": "' + key + '" }'), newOptions);
+                newOptions = $.extend({}, newOptions, JSON.parse('{ "key": "' + key + '" }'));
+            }
+            if (newOptions.events && newOptions.events.initialized) {
+                newOptions.events.initialized.overridden = false;
             }
             this.options = newOptions;
         };
-        HtmlEditorComponent.prototype.doAfterEditorInitialized = function (action) {
+        BaseHtmlEditorComponent.prototype.doAfterEditorInitialized = function (action) {
             var that = this;
             var timeOut = 500;
-            if (this._editorInitialized) {
+            if (this.editorInitialized) {
                 timeOut = 100;
             }
             setTimeout(function () { action(that); }, timeOut);
         };
-        HtmlEditorComponent.prototype.getEditor = function () {
+        BaseHtmlEditorComponent.prototype.getEditor = function () {
             if (this._control)
                 return this._control.getEditor();
             return null;
         };
         //Public Funcs
-        HtmlEditorComponent.prototype.initializeControl = function (control) {
+        BaseHtmlEditorComponent.prototype.initializeControl = function (control) {
             this._control = control;
             this._control.initialize();
-            this._editorInitialized = true;
+            this.editorInitialized = true;
         };
-        HtmlEditorComponent.prototype.setUploadParams = function (uploadType, uploadParentId) {
+        BaseHtmlEditorComponent.prototype.setUploadParams = function (uploadType, uploadParentId) {
             this.doAfterEditorInitialized(function (that) {
                 var editor = that.getEditor();
                 if (typeof (editor) == "undefined" || editor == null) {
@@ -1300,10 +1294,39 @@
                 editor.opts.imageUploadParams.uploadParentId = uploadParentId;
             });
         };
+        __decorate([
+            core.Input()
+        ], BaseHtmlEditorComponent.prototype, "editorId", void 0);
+        __decorate([
+            core.Input()
+        ], BaseHtmlEditorComponent.prototype, "editorLabelText", void 0);
+        __decorate([
+            core.Input()
+        ], BaseHtmlEditorComponent.prototype, "editorOptions", void 0);
+        return BaseHtmlEditorComponent;
+    }(BaseEditComponent));
+
+    /*
+    <file>
+      Authors:
+        Anatoly Osovitny
+        Vadim Osovitny
+
+      Created:
+        12 Dec 2017
+
+      Version:
+        1.0
+
+      Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+    </file>
+    */
+    var HtmlEditorComponent = /** @class */ (function (_super) {
+        __extends(HtmlEditorComponent, _super);
+        function HtmlEditorComponent() {
+            return _super.call(this) || this;
+        }
         HtmlEditorComponent.prototype.setHtml = function (content) {
-            if (this.isFormBased == "1") {
-                return;
-            }
             this.doAfterEditorInitialized(function (that) {
                 var editor = that.getEditor();
                 if (typeof (editor) == "undefined" || editor == null) {
@@ -1313,38 +1336,54 @@
             });
         };
         HtmlEditorComponent.prototype.getHtml = function () {
-            if (this.isFormBased == "1") {
-                return null;
-            }
             var editor = this.getEditor();
             if (typeof (editor) == "undefined" || editor == null) {
                 return;
             }
             return editor.html.get(false);
         };
-        __decorate([
-            core.Input()
-        ], HtmlEditorComponent.prototype, "editorId", void 0);
-        __decorate([
-            core.Input()
-        ], HtmlEditorComponent.prototype, "editorLabelText", void 0);
-        __decorate([
-            core.Input()
-        ], HtmlEditorComponent.prototype, "editorOptions", void 0);
-        __decorate([
-            core.Input()
-        ], HtmlEditorComponent.prototype, "isFormBased", void 0);
-        __decorate([
-            core.Input()
-        ], HtmlEditorComponent.prototype, "editorFormKey", void 0);
         HtmlEditorComponent = __decorate([
             core.Component({
                 selector: 'anatoly-html-editor',
-                template: "<div [ngSwitch]=\"isFormBased\">\r\n  <ng-template ngSwitchCase=\"0\">\r\n    <label>{{ editorLabelText }}</label>\r\n    <textarea id=\"htmleditor-{{editorId}}\" class=\"htmleditor-{{editorId}}\" \r\n              [froalaEditor]=\"options\" (froalaInit)=\"initializeControl($event)\">\r\n    </textarea>\r\n  </ng-template>\r\n\r\n  <ng-template ngSwitchCase=\"1\">\r\n    <div [formGroup]=\"formGroup\">\r\n      <div class=\"form-group\" [ngClass]=\"{'has-error': isItemInvalid(editorFormKey) }\">\r\n        <label class=\"control-label\">{{ editorLabelText }}</label>\r\n        <textarea id=\"htmleditor-{{editorId}}\" class=\"htmleditor-{{editorId}}\"\r\n                  [formControlName]=\"editorFormKey\"\r\n                  [froalaEditor]=\"options\" (froalaInit)=\"initializeControl($event)\">\r\n        </textarea>\r\n        <anatoly-item-validation-summary [formGroup]=\"formGroup\"\r\n                                         [formSubmitted]=\"formSubmitted\"\r\n                                         [key]=\"editorFormKey\"\r\n                                         [title]=\"editorLabelText\">\r\n        </anatoly-item-validation-summary>\r\n      </div>\r\n    </div>\r\n  </ng-template>\r\n</div>\r\n"
+                template: "<div>\r\n  <label>{{ editorLabelText }}</label>\r\n  <textarea id=\"htmleditor-{{editorId}}\" class=\"htmleditor-{{editorId}}\" \r\n            [froalaEditor]=\"options\" (froalaInit)=\"initializeControl($event)\">\r\n  </textarea>\r\n</div>"
             })
         ], HtmlEditorComponent);
         return HtmlEditorComponent;
-    }(BaseEditComponent));
+    }(BaseHtmlEditorComponent));
+
+    /*
+    <file>
+      Authors:
+        Anatoly Osovitny
+        Vadim Osovitny
+
+      Created:
+        12 Dec 2017
+
+      Version:
+        1.0
+
+      Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+    </file>
+    */
+    var FormsHtmlEditorComponent = /** @class */ (function (_super) {
+        __extends(FormsHtmlEditorComponent, _super);
+        function FormsHtmlEditorComponent() {
+            var _this = _super.call(this) || this;
+            _this.editorFormKey = 'html';
+            return _this;
+        }
+        __decorate([
+            core.Input()
+        ], FormsHtmlEditorComponent.prototype, "editorFormKey", void 0);
+        FormsHtmlEditorComponent = __decorate([
+            core.Component({
+                selector: 'anatoly-forms-html-editor',
+                template: "<div [formGroup]=\"formGroup\">\r\n  <div class=\"form-group\" [ngClass]=\"{'has-error': isItemInvalid(editorFormKey) }\">\r\n    <label class=\"control-label\">{{ editorLabelText }}</label>\r\n    <textarea id=\"htmleditor-{{editorId}}\" class=\"htmleditor-{{editorId}}\"\r\n              [formControlName]=\"editorFormKey\"\r\n              [froalaEditor]=\"options\" (froalaInit)=\"initializeControl($event)\">\r\n    </textarea>\r\n    <anatoly-item-validation-summary [formGroup]=\"formGroup\"\r\n                                      [formSubmitted]=\"formSubmitted\"\r\n                                      [key]=\"editorFormKey\"\r\n                                      [title]=\"editorLabelText\">\r\n    </anatoly-item-validation-summary>\r\n  </div>\r\n</div>\r\n"
+            })
+        ], FormsHtmlEditorComponent);
+        return FormsHtmlEditorComponent;
+    }(BaseHtmlEditorComponent));
 
     /*
     <file>
@@ -1386,14 +1425,16 @@
                     http.HttpClientJsonpModule,
                     ItemValidationSummaryComponent,
                     FormValidationSummaryComponent,
+                    ContentHeaderComponent,
                     HtmlEditorComponent,
-                    ContentHeaderComponent
+                    FormsHtmlEditorComponent
                 ],
                 declarations: [
                     ItemValidationSummaryComponent,
                     FormValidationSummaryComponent,
+                    ContentHeaderComponent,
                     HtmlEditorComponent,
-                    ContentHeaderComponent
+                    FormsHtmlEditorComponent
                 ],
                 providers: [],
                 schemas: [
@@ -1419,6 +1460,7 @@
     exports.BuyAccessButtonComponent = BuyAccessButtonComponent;
     exports.ContentHeaderComponent = ContentHeaderComponent;
     exports.FormValidationSummaryComponent = FormValidationSummaryComponent;
+    exports.FormsHtmlEditorComponent = FormsHtmlEditorComponent;
     exports.HtmlEditorComponent = HtmlEditorComponent;
     exports.ItemValidationSummaryComponent = ItemValidationSummaryComponent;
     exports.SignInButtonComponent = SignInButtonComponent;