jodit 3.16.3 → 3.16.4

package/.idea/workspace.xml

@@ -11,12 +11,7 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5da7ff7f-03a8-49de-9fbb-8f8640d83b83" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.MD" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.MD" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/core/decorators/hook/hook.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/core/decorators/hook/hook.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/core/decorators/wait/wait.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/core/decorators/wait/wait.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/tests/units/objectObserverTest.js" beforeDir="false" afterPath="$PROJECT_DIR$/test/tests/units/objectObserverTest.js" afterDir="false" />
-    </list>
+    <list default="true" id="5da7ff7f-03a8-49de-9fbb-8f8640d83b83" name="Default Changelist" comment="" />
     <list id="5049e1d4-15bc-4e3a-b46b-d2ce7537fc13" name="Revert &quot;Some small fixes&quot;" comment="Revert &quot;Some small fixes&quot;&#10;&#10;This reverts commit bc391ec6" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -844,56 +839,9 @@
       <workItem from="1647717009468" duration="1325000" />
       <workItem from="1647720525903" duration="602000" />
       <workItem from="1647723129471" duration="611000" />
-      <workItem from="1647728375663" duration="3084000" />
-    </task>
-    <task id="LOCAL-01022" summary="Update npm and duck typing Dom.isNode">
-      <created>1646343502774</created>
-      <option name="number" value="01022" />
-      <option name="presentableId" value="LOCAL-01022" />
-      <option name="project" value="LOCAL" />
-      <updated>1646343502774</updated>
-    </task>
-    <task id="LOCAL-01023" summary="Fixed bug inside placeholder plugin">
-      <created>1646343584950</created>
-      <option name="number" value="01023" />
-      <option name="presentableId" value="LOCAL-01023" />
-      <option name="project" value="LOCAL" />
-      <updated>1646343584950</updated>
-    </task>
-    <task id="LOCAL-01024" summary="Refactoring paste plugin">
-      <created>1646343640819</created>
-      <option name="number" value="01024" />
-      <option name="presentableId" value="LOCAL-01024" />
-      <option name="project" value="LOCAL" />
-      <updated>1646343640819</updated>
-    </task>
-    <task id="LOCAL-01025" summary="Extract logic with paste from word inside separate plugin">
-      <created>1646343669675</created>
-      <option name="number" value="01025" />
-      <option name="presentableId" value="LOCAL-01025" />
-      <option name="project" value="LOCAL" />
-      <updated>1646343669675</updated>
-    </task>
-    <task id="LOCAL-01026" summary="Extract logic with paste from word inside separate plugin">
-      <created>1646343680982</created>
-      <option name="number" value="01026" />
-      <option name="presentableId" value="LOCAL-01026" />
-      <option name="project" value="LOCAL" />
-      <updated>1646343680982</updated>
-    </task>
-    <task id="LOCAL-01027" summary="Added module description">
-      <created>1646344544587</created>
-      <option name="number" value="01027" />
-      <option name="presentableId" value="LOCAL-01027" />
-      <option name="project" value="LOCAL" />
-      <updated>1646344544587</updated>
-    </task>
-    <task id="LOCAL-01028" summary="Fixed a bug when it was impossible to select a normal font after selecting any other">
-      <created>1646417579156</created>
-      <option name="number" value="01028" />
-      <option name="presentableId" value="LOCAL-01028" />
-      <option name="project" value="LOCAL" />
-      <updated>1646417579156</updated>
+      <workItem from="1647728375663" duration="6312000" />
+      <workItem from="1647859572722" duration="7195000" />
+      <workItem from="1648067246701" duration="18701000" />
     </task>
     <task id="LOCAL-01029" summary="The problem that the selected text disappears #790&#10;Issue: https://github.com/xdan/jodit/issues/790">
       <created>1646547666409</created>
@@ -1189,7 +1137,56 @@
       <option name="project" value="LOCAL" />
       <updated>1647729803543</updated>
     </task>
-    <option name="localTasksCounter" value="1071" />
+    <task id="LOCAL-01071" summary="Fixed composition `wait` and `debounce` decorators">
+      <created>1647732750559</created>
+      <option name="number" value="01071" />
+      <option name="presentableId" value="LOCAL-01071" />
+      <option name="project" value="LOCAL" />
+      <updated>1647732750559</updated>
+    </task>
+    <task id="LOCAL-01072" summary="Fixed apply styles inside another styles">
+      <created>1648290585805</created>
+      <option name="number" value="01072" />
+      <option name="presentableId" value="LOCAL-01072" />
+      <option name="project" value="LOCAL" />
+      <updated>1648290585805</updated>
+    </task>
+    <task id="LOCAL-01073" summary="Sass compile error Css3 min() #809&#10;Issue: https://github.com/xdan/jodit/issues/809">
+      <created>1648376444855</created>
+      <option name="number" value="01073" />
+      <option name="presentableId" value="LOCAL-01073" />
+      <option name="project" value="LOCAL" />
+      <updated>1648376444855</updated>
+    </task>
+    <task id="LOCAL-01074" summary="Fixed image links">
+      <created>1648376457006</created>
+      <option name="number" value="01074" />
+      <option name="presentableId" value="LOCAL-01074" />
+      <option name="project" value="LOCAL" />
+      <updated>1648376457006</updated>
+    </task>
+    <task id="LOCAL-01075" summary="The preview popup has double scrollbars #808&#10;Issue: https://github.com/xdan/jodit/issues/808">
+      <created>1648376761158</created>
+      <option name="number" value="01075" />
+      <option name="presentableId" value="LOCAL-01075" />
+      <option name="project" value="LOCAL" />
+      <updated>1648376761158</updated>
+    </task>
+    <task id="LOCAL-01076" summary="Fixed bug with sync editor size with iframe mode (Works only with [ResizeObserver](https://caniuse.com/resizeobserver))">
+      <created>1648381830154</created>
+      <option name="number" value="01076" />
+      <option name="presentableId" value="LOCAL-01076" />
+      <option name="project" value="LOCAL" />
+      <updated>1648381830154</updated>
+    </task>
+    <task id="LOCAL-01077" summary="Fixed bug with sync editor size with iframe mode (Works only with [ResizeObserver](https://caniuse.com/resizeobserver))">
+      <created>1648381838293</created>
+      <option name="number" value="01077" />
+      <option name="presentableId" value="LOCAL-01077" />
+      <option name="project" value="LOCAL" />
+      <updated>1648381838293</updated>
+    </task>
+    <option name="localTasksCounter" value="1078" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1329,12 +1326,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Separated default editor timeout and `history.timeout`. Now the second setting is just for history.&#10;    Timeouts for all asynchronous operations in Jodit now apply the `defaultTimeout` setting" />
-    <MESSAGE value="Fix version" />
-    <MESSAGE value="Added file for contributing" />
-    <MESSAGE value="Renamed `wrap-text-nodes` plugin to `wrap-nodes`" />
-    <MESSAGE value="Added test for WrapNode.exclude" />
-    <MESSAGE value="Rename file" />
     <MESSAGE value="Added autotest for redo-undo functionality" />
     <MESSAGE value="Fixed - default is not working for insert ordered list and insert unordered list #799&#10;&#10;Issue: https://github.com/xdan/jodit/issues/799" />
     <MESSAGE value="Added `spellcheck` plugin" />
@@ -1354,7 +1345,13 @@
     <MESSAGE value="Added `Config.pasteHTMLActionList` and `Config.pasteFromWordActionList` options &#10;Issue: https://github.com/xdan/jodit/issues/802." />
     <MESSAGE value="Fix doc" />
     <MESSAGE value="&quot;Uncaught TypeError: this.setEditorValue is not a function&quot; with Japanese input method #807&#10;Issue: https://github.com/xdan/jodit/issues/807" />
-    <option name="LAST_COMMIT_MESSAGE" value="&quot;Uncaught TypeError: this.setEditorValue is not a function&quot; with Japanese input method #807&#10;Issue: https://github.com/xdan/jodit/issues/807" />
+    <MESSAGE value="Fixed composition `wait` and `debounce` decorators" />
+    <MESSAGE value="Fixed apply styles inside another styles" />
+    <MESSAGE value="Sass compile error Css3 min() #809&#10;Issue: https://github.com/xdan/jodit/issues/809" />
+    <MESSAGE value="Fixed image links" />
+    <MESSAGE value="The preview popup has double scrollbars #808&#10;Issue: https://github.com/xdan/jodit/issues/808" />
+    <MESSAGE value="Fixed bug with sync editor size with iframe mode (Works only with [ResizeObserver](https://caniuse.com/resizeobserver))" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed bug with sync editor size with iframe mode (Works only with [ResizeObserver](https://caniuse.com/resizeobserver))" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

package/CHANGELOG.MD

@@ -9,9 +9,17 @@
 > -   :house: [Internal]
 > -   :nail_care: [Polish]
 
+## 3.16.4
+
+#### :bug: Bug Fix
+
+-   [Sass compile error Css3 min() #809](https://github.com/xdan/jodit/issues/809)
+-   [The preview popup has double scrollbars #808](https://github.com/xdan/jodit/issues/808)
+-   Fixed bug with sync editor size with iframe mode (Works only with [ResizeObserver](https://caniuse.com/resizeobserver))
+
 ## 3.16.3
 
-* Fixed composition `wait` and `debounce` decorators
+-   Fixed composition `wait` and `debounce` decorators
 
 ## 3.16.2
 
@@ -1232,11 +1240,11 @@ Related with https://github.com/xdan/jodit/issues/574. In some cases need to lim
 -   @property {IUIOption[]} link.selectOptionsClassName=[] The list of the option for the select (to use with
     modeClassName="select")
 -   ex: [
--                                                                                                                                                                                                   	{ value: "", text: "" },
--                                                                                                                                                                                                   	{ value: "val1", text: "text1" },
--                                                                                                                                                                                                   	{ value: "val2", text: "text2" },
--                                                                                                                                                                                                   	{ value: "val3", text: "text3" }
--                                                                                                                                                                                                   ]
+-                                                                                                                                                                                                       	{ value: "", text: "" },
+-                                                                                                                                                                                                       	{ value: "val1", text: "text1" },
+-                                                                                                                                                                                                       	{ value: "val2", text: "text2" },
+-                                                                                                                                                                                                       	{ value: "val3", text: "text3" }
+-                                                                                                                                                                                                       ]
     PR: https://github.com/xdan/jodit/pull/577 Thanks @s-renier-taonix-fr
 
 ##### New option `statusbar: boolean = true`

package/build/jodit.css

@@ -1,14 +1,14 @@
 /*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.16.3
+ * Version: v3.16.4
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
 	/*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.16.3
+ * Version: v3.16.4
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1442,6 +1442,11 @@ svg.jodit-icon {
   opacity: 1;
   outline: 0;
 }
+.jodit-ui-button:focus-visible:not([disabled]) {
+  background-color: #dcdcdc;
+  opacity: 1;
+  outline: 0;
+}
 .jodit-ui-button:active:not([disabled]) {
   background-color: rgba(220, 220, 220, 0.4);
   outline: 0;
@@ -3369,6 +3374,11 @@ svg.jodit-icon {
   opacity: 1;
   outline: 0;
 }
+.jodit-toolbar-button__button:focus-visible:not([disabled]) {
+  background-color: #dcdcdc;
+  opacity: 1;
+  outline: 0;
+}
 .jodit-toolbar-button__button:active:not([disabled]) {
   background-color: rgba(220, 220, 220, 0.4);
   outline: 0;
@@ -3405,6 +3415,11 @@ svg.jodit-icon {
   opacity: 1;
   outline: 0;
 }
+.jodit-toolbar-button__trigger:focus-visible:not([disabled]) {
+  background-color: #dcdcdc;
+  opacity: 1;
+  outline: 0;
+}
 .jodit-toolbar-button__trigger:active:not([disabled]) {
   background-color: rgba(220, 220, 220, 0.4);
   outline: 0;
@@ -3502,6 +3517,11 @@ svg.jodit-icon {
   opacity: 1;
   outline: 0;
 }
+.jodit-toolbar-content:focus-visible:not([disabled]) {
+  background-color: #dcdcdc;
+  opacity: 1;
+  outline: 0;
+}
 .jodit-toolbar-content:active:not([disabled]) {
   background-color: rgba(220, 220, 220, 0.4);
   outline: 0;
@@ -3888,9 +3908,9 @@ svg.jodit-icon {
   display: -ms-flexbox;
   display: flex;
   min-width: 400px;
-  max-width: min(100%, 1000px);
+  max-width: Min(100%, 1000px);
   height: 100%;
-  min-height: min(100%, 500px);
+  min-height: Min(100%, 500px);
   max-height: 100%;
   -webkit-box-align: center;
       -ms-flex-align: center;

package/build/jodit.es2018.css

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.16.3
+ * Version: v3.16.4
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1164,7 +1164,8 @@ svg.jodit-icon {
   min-width: 34px;
   height: 34px;
 }
-.jodit-ui-button:hover:not([disabled]) {
+.jodit-ui-button:hover:not([disabled]),
+.jodit-ui-button:focus-visible:not([disabled]) {
   background-color: var(--jd-color-button-background-hover);
   opacity: 1;
   outline: 0;
@@ -2700,7 +2701,8 @@ svg.jodit-icon {
   border-radius: var(--jd-border-radius-default);
   color: var(--jd-color-text-icons);
 }
-.jodit-toolbar-button__button:hover:not([disabled]) {
+.jodit-toolbar-button__button:hover:not([disabled]),
+.jodit-toolbar-button__button:focus-visible:not([disabled]) {
   background-color: var(--jd-color-button-background-hover);
   opacity: 1;
   outline: 0;
@@ -2727,7 +2729,8 @@ svg.jodit-icon {
   cursor: pointer;
   width: 14px;
 }
-.jodit-toolbar-button__trigger:hover:not([disabled]) {
+.jodit-toolbar-button__trigger:hover:not([disabled]),
+.jodit-toolbar-button__trigger:focus-visible:not([disabled]) {
   background-color: var(--jd-color-button-background-hover);
   opacity: 1;
   outline: 0;
@@ -2808,7 +2811,8 @@ svg.jodit-icon {
   padding: 0;
   border: 1px solid transparent;
 }
-.jodit-toolbar-content:hover:not([disabled]) {
+.jodit-toolbar-content:hover:not([disabled]),
+.jodit-toolbar-content:focus-visible:not([disabled]) {
   background-color: var(--jd-color-button-background-hover);
   opacity: 1;
   outline: 0;
@@ -3168,9 +3172,9 @@ svg.jodit-icon {
   position: relative;
   display: flex;
   min-width: 400px;
-  max-width: min(100%, 1000px);
+  max-width: Min(100%, 1000px);
   height: 100%;
-  min-height: min(100%, 500px);
+  min-height: Min(100%, 500px);
   max-height: 100%;
   align-items: center;
   justify-content: center;

package/build/jodit.es2018.en.css

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.16.3
+ * Version: v3.16.4
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -1164,7 +1164,8 @@ svg.jodit-icon {
   min-width: 34px;
   height: 34px;
 }
-.jodit-ui-button:hover:not([disabled]) {
+.jodit-ui-button:hover:not([disabled]),
+.jodit-ui-button:focus-visible:not([disabled]) {
   background-color: var(--jd-color-button-background-hover);
   opacity: 1;
   outline: 0;
@@ -2700,7 +2701,8 @@ svg.jodit-icon {
   border-radius: var(--jd-border-radius-default);
   color: var(--jd-color-text-icons);
 }
-.jodit-toolbar-button__button:hover:not([disabled]) {
+.jodit-toolbar-button__button:hover:not([disabled]),
+.jodit-toolbar-button__button:focus-visible:not([disabled]) {
   background-color: var(--jd-color-button-background-hover);
   opacity: 1;
   outline: 0;
@@ -2727,7 +2729,8 @@ svg.jodit-icon {
   cursor: pointer;
   width: 14px;
 }
-.jodit-toolbar-button__trigger:hover:not([disabled]) {
+.jodit-toolbar-button__trigger:hover:not([disabled]),
+.jodit-toolbar-button__trigger:focus-visible:not([disabled]) {
   background-color: var(--jd-color-button-background-hover);
   opacity: 1;
   outline: 0;
@@ -2808,7 +2811,8 @@ svg.jodit-icon {
   padding: 0;
   border: 1px solid transparent;
 }
-.jodit-toolbar-content:hover:not([disabled]) {
+.jodit-toolbar-content:hover:not([disabled]),
+.jodit-toolbar-content:focus-visible:not([disabled]) {
   background-color: var(--jd-color-button-background-hover);
   opacity: 1;
   outline: 0;
@@ -3168,9 +3172,9 @@ svg.jodit-icon {
   position: relative;
   display: flex;
   min-width: 400px;
-  max-width: min(100%, 1000px);
+  max-width: Min(100%, 1000px);
   height: 100%;
-  min-height: min(100%, 500px);
+  min-height: Min(100%, 500px);
   max-height: 100%;
   align-items: center;
   justify-content: center;

package/build/jodit.es2018.en.js

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is awesome and usefully wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/)
- * Version: v3.16.3
+ * Version: v3.16.4
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -4842,6 +4842,7 @@ function toggleCommitStyles(commitStyle, elm) {
 
 
 
+
 function unwrapChildren(style, font) {
     const needUnwrap = [];
     const needChangeStyle = [];
@@ -4852,7 +4853,8 @@ function unwrapChildren(style, font) {
         let item = gen.next();
         while (!item.done) {
             const elm = item.value;
-            if (isSuitElement(style, elm, true)) {
+            if (isSuitElement(style, elm, true) &&
+                (!cssStyle || elementHasSameStyleKeys(elm, cssStyle))) {
                 if (firstElementSuit === undefined) {
                     firstElementSuit = true;
                 }
@@ -4870,7 +4872,8 @@ function unwrapChildren(style, font) {
                     if (!(0,helpers.attr)(elm, 'style')) {
                         (0,helpers.attr)(elm, 'style', null);
                     }
-                    if (elm.nodeName.toLowerCase() === style.element) {
+                    if (!(0,helpers.attr)(elm, 'style') &&
+                        elm.nodeName.toLowerCase() === style.element) {
                         needUnwrap.push(elm);
                     }
                 });
@@ -8739,7 +8742,7 @@ class Popup extends ui/* UIElement */.u1 {
         this.updatePosition();
         return this;
     }
-    open(getBound, keepPosition = false) {
+    open(getBound, keepPosition = false, parentContainer) {
         (0,helpers.markOwner)(this.jodit, this.container);
         this.calculateZIndex();
         this.isOpened = true;
@@ -8747,10 +8750,15 @@ class Popup extends ui/* UIElement */.u1 {
         this.targetBound = !keepPosition
             ? getBound
             : this.getKeepBound(getBound);
-        const parentContainer = (0,global/* getContainer */.ZO)(this.jodit, Popup);
-        if (parentContainer !== this.container.parentElement) {
+        if (parentContainer) {
             parentContainer.appendChild(this.container);
         }
+        else {
+            const popupContainer = (0,global/* getContainer */.ZO)(this.jodit, Popup);
+            if (parentContainer !== this.container.parentElement) {
+                popupContainer.appendChild(this.container);
+            }
+        }
         this.updatePosition();
         this.j.e.fire(this, 'afterOpen');
         return this;
@@ -11758,7 +11766,7 @@ class View extends component/* Component */.wA {
         this.isView = true;
         this.mods = {};
         this.components = new Set();
-        this.version = "3.16.3";
+        this.version = "3.16.4";
         this.async = new Async();
         this.buffer = Storage.makeStorage();
         this.storage = Storage.makeStorage(true, this.componentName);
@@ -11856,10 +11864,10 @@ class View extends component/* Component */.wA {
         return this.__isFullSize;
     }
     getVersion() {
-        return "3.16.3";
+        return "3.16.4";
     }
     static getVersion() {
-        return "3.16.3";
+        return "3.16.4";
     }
     initOptions(options) {
         this.options = (0,helpers.ConfigProto)(options || {}, (0,helpers.ConfigProto)(this.options || {}, View.defaultOptions));
@@ -12357,7 +12365,9 @@ let ToolbarButton = class ToolbarButton extends ui_button/* UIButton */.y3 {
                 if (elm) {
                     popup
                         .setContent((0,helpers.isString)(elm) ? this.j.c.fromHTML(elm) : elm)
-                        .open(() => (0,helpers.position)(this.container));
+                        .open(() => (0,helpers.position)(this.container), false, this.j.o.allowTabNavigation
+                        ? this.container
+                        : undefined);
                 }
             }
             this.j.e.fire((0,helpers.camelCase)(`after-${ctr.name}-open-popup`), popup.container);
@@ -12403,7 +12413,7 @@ let ToolbarButton = class ToolbarButton extends ui_button/* UIButton */.y3 {
         toolbar.build((0,helpers.isArray)(list)
             ? list.map(getButton)
             : (0,helpers.keys)(list, false).map(key => getButton(key, list[key])), this.target);
-        menu.setContent(toolbar.container).open(() => (0,helpers.position)(this.container));
+        menu.setContent(toolbar.container).open(() => (0,helpers.position)(this.container), false, this.j.o.allowTabNavigation ? this.container : undefined);
         this.state.activated = true;
     }
     onOutsideClick(e) {
@@ -21849,6 +21859,10 @@ function iframe(editor) {
                     .on('change afterInit afterSetMode resize', resizeIframe)
                     .on([editor.iframe, editor.ew, doc.documentElement], 'load', resizeIframe)
                     .on(doc, 'readystatechange DOMContentLoaded', resizeIframe);
+                if (typeof ResizeObserver === 'function') {
+                    const resizeObserver = new ResizeObserver(resizeIframe);
+                    resizeObserver.observe(doc.body);
+                }
             }
             if (doc.documentElement) {
                 editor.e
@@ -28093,6 +28107,13 @@ function previewBox(editor, defaultValue, points = 'px', container = null) {
             if (myWindow) {
                 editor.e.fire('generateDocumentStructure.iframe', myWindow.document, editor);
                 div = myWindow.document.body;
+                if (typeof ResizeObserver === 'function') {
+                    const resizeObserver = new ResizeObserver(entries => {
+                        iframe.style.height =
+                            myWindow.document.body.offsetHeight + 20 + 'px';
+                    });
+                    resizeObserver.observe(myWindow.document.body);
+                }
             }
         }
         else {