@creative-web-solution/front-library 7.1.4 → 7.1.5

package/CHANGELOG.md

@@ -1,10 +1,14 @@
 # CHANGELOG
 
 
+## 7.1.5
+
+* Typescript: Fix some type
+
+
 ## 7.1.4
 
 * Typescript: Fix tsify and browserify compatibility
-* HistoryController: Remove UrlParser for window.URL
 
 
 ## 7.1.3

package/Events/HistoryController.ts

@@ -1,4 +1,5 @@
 import { on }        from './EventsManager';
+import { UrlParser } from '../Helpers/UrlParser';
 import { slice }     from '../Helpers/Slice';
 
 
@@ -32,7 +33,7 @@ export default class HistoryController {
     #hasPushstate:           boolean;
     #hasPopStateEvent:       boolean;
     #currentState:           FLib.Events.History.StateObject;
-    #registeredFunctionList: (( url: URL, state: any ) => void)[];
+    #registeredFunctionList: (( url: FLib.Helpers.UrlParser, state: any ) => void)[];
 
 
     get state(): FLib.Events.History.StateObject {
@@ -52,7 +53,7 @@ export default class HistoryController {
         this.#defaultTitle = encodeURIComponent( defaultTitle );
 
         this.#currentState = {
-            "url":   new window.URL( window.location.href ),
+            "url":   new UrlParser( window.location.href ),
             "state": {},
             "title": this.#defaultTitle
         };
@@ -68,7 +69,7 @@ export default class HistoryController {
 
 
     // Call each registered function for popstate event
-    #callRegisteredFunction = ( url: URL, state: any ): void => {
+    #callRegisteredFunction = ( url: FLib.Helpers.UrlParser, state: any ): void => {
         if ( !this.#registeredFunctionList.length ) {
             return;
         }
@@ -86,7 +87,7 @@ export default class HistoryController {
         }
 
         this.#currentState = {
-            "url": new URL( document.location.href ),
+            "url": new UrlParser( document.location.href ),
             state,
             "title": ""
         };
@@ -100,15 +101,15 @@ export default class HistoryController {
      *
      * @param state - Native browser state object
      */
-    pushState( state: any, title: string, url: string | URL ): this {
+    pushState( state: any, title: string, url: string | UrlParser ): this {
         if ( !this.#hasPushstate ) {
             return this;
         }
 
-        url = url instanceof URL ? url : new URL( url as string );
+        url = url instanceof UrlParser ? url : new UrlParser( url as string );
 
         this.#currentState = {
-            "url": url as URL,
+            "url": url as UrlParser,
             state,
             "title": title ? encodeURIComponent( title ) : this.#defaultTitle
         };
@@ -117,7 +118,7 @@ export default class HistoryController {
             window.history.pushState(
                 state,
                 this.#currentState.title,
-                this.#currentState.url.href
+                this.#currentState.url.absolute2
             );
         }
         catch ( e ) {
@@ -136,14 +137,14 @@ export default class HistoryController {
             return this;
         }
 
-        anchor = anchor.indexOf( '#' ) === -1 ? `#${ anchor }` : anchor;
+        anchor = anchor.indexOf( '#' ) === -1 ? anchor : anchor.slice( 1 );
 
         try {
-            this.#currentState.url.hash = anchor.indexOf( '#' ) === -1 ? `#${ anchor }` : anchor;
+            this.#currentState.url.setAnchor( anchor );
             window.history.pushState(
                 this.#currentState.state,
                 this.#currentState.title,
-                this.#currentState.url.href
+                this.#currentState.url.absolute2
             );
         }
         catch ( e ) {

package/Modules/Popin/Popin.ts

@@ -53,7 +53,7 @@ export default class Popin {
 
         if ( _controllerOptions ) {
             this.#options         = userOptions as FLib.Popin.Options;
-            this.#backgroundLayer = _controllerOptions.background;
+            this.#backgroundLayer = _controllerOptions.background as PopinBackground;
         }
         else {
             this.#options         = extend( defaultOptions, userOptions );
@@ -427,7 +427,8 @@ export default class Popin {
         e.preventDefault();
 
         if ( this.#controllerOptions ) {
-            return this.#controllerOptions.controller.close();
+            this.#controllerOptions.controller.close();
+            return;
         }
 
         this.#closePopin();

package/README.md

@@ -1,6 +1,6 @@
 # Front Library
 
-@version: 7.1.4
+@version: 7.1.5
 
 
 ## Use

package/Types/EventsHelpers.d.ts

@@ -179,12 +179,12 @@ declare namespace FLib {
          */
         namespace History {
             type StateObject = {
-                url:    URL;
+                url:    FLib.Helpers.UrlParser;
                 state:  any;
                 title:  string;
             }
 
-            type Callback = ( url: URL, state: any ) => void;
+            type Callback = ( url: FLib.Helpers.UrlParser, state: any ) => void;
         }
 
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@creative-web-solution/front-library",
   "title": "Frontend library",
   "description": "Frontend functions and modules",
-  "version": "7.1.4",
+  "version": "7.1.5",
   "homepage": "https://github.com/creative-web-solution/front-library",
   "author": "Creative Web Solution <contact@cws-studio.com> (https://www.cws-studio.com)",
   "keywords": [],