@supersoniks/concorde 1.1.45 → 1.1.47

package/core/components/ui/modal/modal.js

@@ -21,17 +21,33 @@ let Modal = class Modal extends Subscriber(LitElement) {
     constructor() {
         super(...arguments);
         this.forceAction = false;
+        this.removeOnHide = false;
         this.align = "left";
         this.padding = "var(--sc-modal-py) var(--sc-modal-px)";
         this.maxWidth = "var(--sc-modal-max-w) ";
         this.maxHeight = "var(--sc-modal-max-h) ";
         this.width = "100%";
         this.height = "auto";
+        this.zIndex = "var(--sc-modal-z-index)";
         this.fullScreen = false;
         this.visible = false;
     }
     static create(options) {
         const modal = document.createElement(tagName);
+        // modal styles
+        if (options.removeOnHide === true)
+            modal.setAttribute("removeOnHide", "true");
+        if (options.maxWidth)
+            modal.maxWidth = options === null || options === void 0 ? void 0 : options.maxWidth;
+        if (options.width)
+            modal.width = options === null || options === void 0 ? void 0 : options.width;
+        if (options.paddingX)
+            modal.style.setProperty("--sc-modal-px", options === null || options === void 0 ? void 0 : options.paddingX);
+        if (options.paddingY)
+            modal.style.setProperty("--sc-modal-py", options === null || options === void 0 ? void 0 : options.paddingY);
+        if (options.zIndex)
+            modal.style.setProperty("--sc-modal-z-index", options === null || options === void 0 ? void 0 : options.zIndex);
+        // inner content
         modal.innerHTML =
             `<sonic-modal-close></sonic-modal-close><sonic-modal-content>${options.content}</sonic-modal-content>` || "";
         const container = document.querySelector("sonic-theme") || document.body;
@@ -67,6 +83,7 @@ let Modal = class Modal extends Subscriber(LitElement) {
             maxHeight: this.maxHeight,
             width: this.width,
             height: this.height,
+            zIndex: this.zIndex,
             borderRadius: this.fullScreen ? "0" : "var(--sc-modal-rounded)",
         };
         const modalWrapperStyles = {
@@ -105,7 +122,7 @@ let Modal = class Modal extends Subscriber(LitElement) {
 
       <div
         class="overlay"
-        @click="${!this.forceAction ? this.hide : ""}"
+        @click="${!this.forceAction ? this.hide : null}"
         ${animate({
             keyframeOptions: {
                 duration: 500,
@@ -130,6 +147,9 @@ let Modal = class Modal extends Subscriber(LitElement) {
         if (this.hasAttribute("resetDataProviderOnHide")) {
             PublisherManager.get(this.getAttribute("resetDataProviderOnHide")).set({});
         }
+        if (this.removeOnHide) {
+            this.remove();
+        }
     }
     dispose() {
         this.hide();
@@ -138,9 +158,9 @@ let Modal = class Modal extends Subscriber(LitElement) {
     handleEscape(e) {
         if (e.key === "Escape") {
             const modals = [...document.querySelectorAll(tagName)];
-            modals.forEach((item) => {
-                if (!this.forceAction) {
-                    item.hide();
+            modals.forEach((modal) => {
+                if (!modal.forceAction) {
+                    modal.hide();
                 }
             });
         }
@@ -164,6 +184,7 @@ Modal.styles = [
         --sc-modal-max-w: min(100vw, 64ch);
         --sc-modal-max-h: 80vh;
         --sc-modal-rounded: var(--sc-rounded-lg);
+        --sc-modal-z-index: 990;
       }
 
       * {
@@ -175,7 +196,7 @@ Modal.styles = [
         bottom: 0;
         left: 0;
         width: 100%;
-        z-index: 990;
+        z-index: calc(var(--sc-modal-z-index) + 1);
         align-items: center;
         justify-content: center;
         flex-direction: column;
@@ -207,7 +228,7 @@ Modal.styles = [
         top: 0;
         right: 0;
         bottom: 0;
-        z-index: 900;
+        z-index: var(--sc-modal-z-index);
         opacity: 0.8;
         position: fixed;
       }
@@ -226,6 +247,7 @@ Modal.styles = [
         .modal {
           max-width: none !important;
           width: 100% !important;
+          border-radius: var(--sc-modal-rounded) var(--sc-modal-rounded) 0 0 !important;
         }
       }
 
@@ -270,6 +292,9 @@ Modal.styles = [
 __decorate([
     property({ type: Boolean })
 ], Modal.prototype, "forceAction", void 0);
+__decorate([
+    property({ type: Boolean })
+], Modal.prototype, "removeOnHide", void 0);
 __decorate([
     property({ type: String, reflect: true })
 ], Modal.prototype, "align", void 0);
@@ -288,6 +313,9 @@ __decorate([
 __decorate([
     property({ type: String })
 ], Modal.prototype, "height", void 0);
+__decorate([
+    property({ type: String })
+], Modal.prototype, "zIndex", void 0);
 __decorate([
     property({ type: Boolean, reflect: true })
 ], Modal.prototype, "fullScreen", void 0);

package/core/components/ui/pop/pop.js

@@ -85,7 +85,6 @@ let Pop = Pop_1 = class Pop extends LitElement {
     firstUpdated(_changedProperties) {
         super.firstUpdated(_changedProperties);
         this.resizeObserver.observe(this.popContent);
-        this.computePosition(this.placement);
     }
     disconnectedCallback() {
         super.disconnectedCallback();
@@ -179,6 +178,7 @@ let Pop = Pop_1 = class Pop extends LitElement {
         name="content"
         tabindex="-1"
         part="content"
+        style="display: none;"
         class="  
           ${this.open ? "is-open" : ""}"
       ></slot>

package/core/components/ui/theme/theme-collection/core-variables.js

@@ -2,12 +2,13 @@ import { css } from "lit";
 export const coreVariables = css `
   :host {
     /* polices*/
-    --sc-font-family-base: "Inter var", "Inter", -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto,
-      "Helvetica Neue", Arial, sans-serif;
+    --sc-font-family-base: "Inter var", "Inter", -apple-system, system-ui,
+      BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial,
+      sans-serif;
     --sc-font-weight-base: 400;
     --sc-font-style-base: normal;
 
-    --sc-headings-font-family: var(--sc-font-family-base);
+    --sc-headings-font-family: var(--sc-font-family-base), sans-serif;
     --sc-headings-font-style: var(--sc-font-style-base);
     --sc-headings-line-height: 1.1;
     --sc-headings-font-weight: 700;
@@ -29,16 +30,23 @@ export const coreVariables = css `
     /* 4 for rounded full*/
     --sc-btn-rounded-intensity: 1.4;
     --sc-btn-font-weight: 500;
-    --sc-btn-rounded: calc((var(--sc-rounded) + var(--sc-rounded-size-intensity)) * var(--sc-btn-rounded-intensity));
+    --sc-btn-rounded: calc(
+      (var(--sc-rounded) + var(--sc-rounded-size-intensity)) *
+        var(--sc-btn-rounded-intensity)
+    );
 
     /* Placeholder */
     --sc-placeholder-bg: rgba(17, 24, 39, 0.05);
 
     /* OMBRES */
-    --sc-shadow-sm: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
-    --sc-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
-    --sc-shadow-lg: 0 10px 15px 0px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
-    --sc-shadow-xl: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1);
+    --sc-shadow-sm: 0 1px 3px 0 rgb(0 0 0 / 0.1),
+      0 1px 2px -1px rgb(0 0 0 / 0.1);
+    --sc-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1),
+      0 2px 4px -2px rgb(0 0 0 / 0.1);
+    --sc-shadow-lg: 0 10px 15px 0px rgb(0 0 0 / 0.1),
+      0 4px 6px -4px rgb(0 0 0 / 0.1);
+    --sc-shadow-xl: 0 20px 25px -5px rgb(0 0 0 / 0.1),
+      0 8px 10px -6px rgb(0 0 0 / 0.1);
     --sc-shadow-2xl: 0 25px 50px -12px rgb(0 0 0 / 0.25);
 
     /* Forms */
@@ -50,7 +58,8 @@ export const coreVariables = css `
     --sc-input-border-color: var(--sc-input-bg);
     --sc-input-rounded-intensity: 1.4;
     --sc-input-rounded: calc(
-      (var(--sc-rounded) + var(--sc-rounded-size-intensity)) * var(--sc-input-rounded-intensity)
+      (var(--sc-rounded) + var(--sc-rounded-size-intensity)) *
+        var(--sc-input-rounded-intensity)
     );
     --sc-label-font-weight: 500;
 

package/core/components/ui/theme/theme.js

@@ -10,6 +10,7 @@ import { customElement, property } from "lit/decorators.js";
 import { coreVariables } from "@supersoniks/concorde/core/components/ui/theme/theme-collection/core-variables";
 import { light } from "@supersoniks/concorde/core/components/ui/theme/theme-collection/light";
 import { dark } from "@supersoniks/concorde/core/components/ui/theme/theme-collection/dark";
+import { PublisherManager } from "@supersoniks/concorde/utils";
 const tagName = "sonic-theme";
 let Theme = Theme_1 = class Theme extends LitElement {
     constructor() {
@@ -25,21 +26,24 @@ let Theme = Theme_1 = class Theme extends LitElement {
         this.postCSSVars();
     }
     postCSSVars() {
+        var _a;
         const stylesheets = document.styleSheets;
         const ssLength = stylesheets.length;
         const fontUrls = [];
         for (let i = 0; i < ssLength; i++) {
             const ss = stylesheets[i];
-            if (ss.href && (ss.href.includes("googleapis") || ss.href.includes("typekit.net")))
+            if (ss.href &&
+                (ss.href.includes("googleapis") || ss.href.includes("typekit.net")))
                 fontUrls.push(ss.href);
         }
+        const theme = {
+            variables: this.getCssVariables(),
+            fonts: fontUrls,
+        };
+        (_a = PublisherManager.get("sonic-theme")) === null || _a === void 0 ? void 0 : _a.set(theme);
         document.querySelectorAll("iframe").forEach((elt) => {
             var _a;
-            return (_a = elt.contentWindow) === null || _a === void 0 ? void 0 : _a.postMessage({
-                type: "SonicTheme",
-                variables: this.getCssVariables(),
-                fonts: fontUrls,
-            }, "*");
+            return (_a = elt.contentWindow) === null || _a === void 0 ? void 0 : _a.postMessage(Object.assign({ type: "SonicTheme" }, theme), "*");
         });
     }
     receiveMessage(event) {
@@ -50,7 +54,10 @@ let Theme = Theme_1 = class Theme extends LitElement {
     }
     getCssVariables() {
         const names = [];
-        const stylesheets = [...Theme_1.styles.map((s) => s.styleSheet), ...Array.from(document.styleSheets)];
+        const stylesheets = [
+            ...Theme_1.styles.map((s) => s.styleSheet),
+            ...Array.from(document.styleSheets),
+        ];
         for (const stylesheet of stylesheets) {
             try {
                 if (!stylesheet)
@@ -96,7 +103,7 @@ Theme.styles = [
       }
 
       :host([font]) {
-        font-family: var(--sc-font-family-base);
+        font-family: var(--sc-font-family-base), sans-serif;
         font-weight: var(--sc-font-weight-base);
         font-style: var(--sc-font-style-base);
       }

package/core/components/ui/toast/toast.d.ts

@@ -8,7 +8,7 @@ export declare class SonicToast extends LitElement {
     render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static removeAll(): void;
     static add(conf: Toast): {
-        id: number;
+        id: string | number;
         text: string;
         title: string | undefined;
         status: import("@supersoniks/concorde/core/components/ui/toast/types").ToastStatus;

package/core/components/ui/toast/types.d.ts

@@ -1,7 +1,7 @@
 import { Message } from "@supersoniks/concorde/la-billetterie/_types/swagger";
 export type ToastStatus = Message["status"] | "" | "success";
 export type Toast = {
-    id?: number;
+    id?: string | number;
     text: string;
     title?: string;
     status?: ToastStatus;

package/core/components/ui/ui.d.ts

@@ -19,7 +19,6 @@ import "./group/group";
 import "./icon/icon";
 import "./image/image";
 import "./loader/loader";
-import "../../../la-billetterie/components/event/atoms/taxonomy/taxonomy";
 import "./menu/menu";
 import "./modal/modal";
 import "./alert/alert";

package/core/components/ui/ui.js

@@ -23,7 +23,6 @@ import "./group/group";
 import "./icon/icon";
 import "./image/image";
 import "./loader/loader";
-import "../../../la-billetterie/components/event/atoms/taxonomy/taxonomy";
 //Menu
 import "./menu/menu";
 // Misc

package/core/mixins/Fetcher.d.ts

@@ -54,7 +54,8 @@ declare const Fetcher: <T extends Constructor<SubscriberInterface<PropsType>>, P
         /**
          * Première update, le comportement de lazyload est géré ici a l'aide d'un intersection observer.
          */
-        firstUpdated(): void;
+        lazyLoadSpan?: HTMLSpanElement | undefined;
+        handleLazyLoad(): void;
         onIntersection(entries: IntersectionObserverEntry[]): void;
         propertyMap: object;
         isConnected: boolean;
@@ -80,6 +81,7 @@ declare const Fetcher: <T extends Constructor<SubscriberInterface<PropsType>>, P
         requestUpdate(): void;
         getAttribute(name: string): string;
         hasAttribute(attributeName: string): boolean;
+        getBoundingClientRect(): DOMRect;
     };
 } & T;
 export default Fetcher;

package/core/mixins/Fetcher.js

@@ -87,29 +87,46 @@ const Fetcher = (superClass, propsType) => {
                     return;
                 // if (!this.dataProvider) return;
                 this.dispatchEvent(new CustomEvent("loading", { detail: this }));
-                this.isLoading = true;
-                this.requestUpdate();
+                if (this.getAttribute("localStorage") === "enabled") {
+                    yield PublisherManager.getInstance().isLocalStrorageReady;
+                }
+                if (!this.isConnected)
+                    return;
                 const hasLoader = this.isDefaultLoaderEnabled && !this.hasAttribute("noLoader");
-                if (hasLoader)
+                if (hasLoader) {
                     Loader.show();
+                }
                 const headerData = PublisherManager.getInstance()
                     .get(this.getAncestorAttributeValue("headersDataProvider"))
                     .get();
+                this.isLoading = true;
+                if (Objects.isObject(this.props) && Object.keys(this.props || {}).length > 0 && this.isFirstLoad) {
+                    this.dispatchEvent(new CustomEvent("load", { detail: this }));
+                    this.isFirstLoad = false;
+                    this.isLoading = false;
+                }
                 let data = yield this.api.get(this.endPoint || this.dataProvider || "", headerData);
+                if (!this.isConnected) {
+                    if (hasLoader)
+                        Loader.hide();
+                    return;
+                }
                 // Je garde ça mais normalement ça n'arrive jamais
                 if (!data) {
                     SonicToast.add({ text: "Network Error", status: "error" });
                     this.isLoading = false;
-                    if (hasLoader)
+                    if (hasLoader) {
                         Loader.hide();
+                    }
                     return;
                 }
                 // Si data ne contient que la réponse HTTP, avec un statut not ok, on affiche un message
                 else if (data._sonic_http_response_ && !data._sonic_http_response_.ok && Object.keys(data).length === 1) {
                     SonicToast.add({ text: "Network Error", status: "error" });
                 }
-                if (hasLoader)
+                if (hasLoader) {
                     Loader.hide();
+                }
                 if (this.key) {
                     const response = data._sonic_http_response_;
                     /* preserveOtherKeys s'exprime lorsque le paramètre "key" est défini
@@ -138,11 +155,10 @@ const Fetcher = (superClass, propsType) => {
         connectedCallback() {
             var _a;
             // this.noShadowDom = "";
+            super.connectedCallback();
             if (!this.isFetchEnabled) {
-                super.connectedCallback();
                 return;
             }
-            super.connectedCallback();
             this.key = this.getAttribute("key");
             if (this.props) {
                 this.publisher.set(this.props);
@@ -153,25 +169,35 @@ const Fetcher = (superClass, propsType) => {
             if (lazyLoad === null) {
                 this._fetchData();
             }
+            else {
+                this.handleLazyLoad();
+            }
         }
-        /**
-         * Première update, le comportement de lazyload est géré ici a l'aide d'un intersection observer.
-         */
-        firstUpdated() {
+        handleLazyLoad() {
             const lazyLoad = this.getAttribute("lazyload");
             if (lazyLoad === null) {
                 return;
             }
+            const rect = this.getBoundingClientRect();
+            if (rect.x < window.innerWidth && rect.right > 0 && rect.y < window.innerHeight && rect.right > 0) {
+                this._fetchData();
+                return;
+            }
+            const boundsRatio = parseFloat(this.getAttribute("lazyBoundsRatio") || "1");
             const options = {
                 root: null,
-                rootMargin: Math.max(window.innerWidth, window.innerHeight) + "px",
+                rootMargin: Math.max(window.innerWidth * boundsRatio, window.innerHeight * boundsRatio) + "px",
             };
             this.iObserver = new IntersectionObserver((entries) => this.onIntersection(entries), options);
-            let elt = this.shadowRoot ? this.shadowRoot.children[0] : this.children[0];
-            if (elt && elt.nodeName.toLocaleLowerCase() == "slot")
+            let elt = (this.shadowRoot ? this.shadowRoot.children[0] : this.children[0]);
+            if ((elt === null || elt === void 0 ? void 0 : elt.nodeName.toLocaleLowerCase()) == "slot")
                 elt = elt.children[0];
             if (!elt || elt.nodeName.toLocaleLowerCase() == "template") {
                 elt = document.createElement("span");
+                const style = elt.style;
+                style.position = "absolute";
+                style.pointerEvents = "none";
+                this.lazyLoadSpan = elt;
                 this.appendChild(elt);
             }
             if (elt) {
@@ -182,9 +208,14 @@ const Fetcher = (superClass, propsType) => {
             }
         }
         onIntersection(entries) {
+            var _a, _b;
             for (const e of entries) {
                 if (e.isIntersecting && this.isFirstLoad) {
                     this._fetchData();
+                    (_a = this.lazyLoadSpan) === null || _a === void 0 ? void 0 : _a.remove();
+                    this.lazyLoadSpan = undefined;
+                    (_b = this.iObserver) === null || _b === void 0 ? void 0 : _b.disconnect();
+                    break;
                 }
             }
         }

package/core/mixins/FormCheckable.d.ts

@@ -81,6 +81,7 @@ declare const Form: <T extends Constructor<FormElementInterface>>(superClass: T)
         requestUpdate(): void;
         getAttribute(name: string): string;
         hasAttribute(attributeName: string): boolean;
+        getBoundingClientRect(): DOMRect;
     };
 } & T;
 export default Form;

package/core/mixins/FormInput.d.ts

@@ -65,6 +65,7 @@ declare const Form: <T extends Constructor<FormElementInterface>>(superClass: T)
         getAttribute(name: string): string;
         hasAttribute(attributeName: string): boolean;
         disconnectedCallback(): void;
+        getBoundingClientRect(): DOMRect;
     };
 } & T;
 export default Form;

package/core/mixins/Subscriber.d.ts

@@ -30,6 +30,7 @@ export interface SubscriberInterface<PropsType = CoreJSType> {
     getAttribute(name: string): string;
     hasAttribute(attributeName: string): boolean;
     disconnectedCallback(): void;
+    getBoundingClientRect(): DOMRect;
 }
 declare const Subscriber: <PropsType = CoreJSType, T extends Constructor<LitElement> = Constructor<LitElement>>(superClass: T, type?: PropsType | undefined) => Constructor<SubscriberInterface<PropsType>> & T;
 export default Subscriber;

package/core/mixins/Subscriber.js

@@ -141,18 +141,22 @@ const Subscriber = (superClass, type) => {
                 this.style.removeProperty("display");
         }
         connectedCallback() {
+            SubscriberElement.instanceCounter++;
             if (this.hasAttribute("lazyRendering")) {
                 const options = {
                     root: null,
-                    rootMargin: Math.max(window.innerWidth * 0.1, window.innerHeight * 0.1) + "px",
+                    rootMargin: Math.max(window.innerWidth, window.innerHeight) + "px",
                 };
                 let firstView = true;
                 const iObserver = new IntersectionObserver((entries) => {
                     for (const e of entries) {
                         if (firstView && e.isIntersecting) {
+                            this.addDebugger();
                             firstView = false;
                             this.initWording();
                             this.initPublisher();
+                            iObserver.disconnect();
+                            break;
                         }
                     }
                 }, options);
@@ -161,10 +165,9 @@ const Subscriber = (superClass, type) => {
             else {
                 this.initWording();
                 this.initPublisher();
+                this.addDebugger();
             }
-            this.addDebugger();
             super.connectedCallback();
-            SubscriberElement.instanceCounter++;
         }
         disconnectedCallback() {
             var _a;
@@ -260,7 +263,8 @@ const Subscriber = (superClass, type) => {
                 password = this.getAncestorAttributeValue("password");
             }
             const credentials = this.getAncestorAttributeValue("credentials") || undefined;
-            return { serviceURL, token, userName, password, authToken, tokenProvider, addHTTPResponse, credentials };
+            const cache = (this.getAttribute("cache") || undefined) || undefined;
+            return { serviceURL, token, userName, password, authToken, tokenProvider, addHTTPResponse, credentials, cache };
         }
         initWording() {
             return __awaiter(this, void 0, void 0, function* () {
@@ -274,16 +278,17 @@ const Subscriber = (superClass, type) => {
                 }
                 if (!hasWording)
                     return;
-                const publisher = PublisherManager.getInstance().get("sonic-wording");
+                const publisher = PublisherManager.get("sonic-wording");
                 const wordingProvider = this.getAncestorAttributeValue("wordingProvider");
                 const api = new API(this.getApiConfiguration());
                 if (wordingProvider) {
                     const wordings = [];
                     const wordingsAll = [];
+                    const publisherValue = publisher.get();
                     for (const p of propNames) {
                         if (p.indexOf("wording_") == 0) {
                             const p8 = p.substring(8);
-                            if (!publisher.get()[p]) {
+                            if (!publisherValue[p]) {
                                 publisher[p] = "...";
                                 wordings.push(p8);
                             }
@@ -334,7 +339,7 @@ const Subscriber = (superClass, type) => {
                 if (this.bindPublisher) {
                     mng.set(publisherId, this.bindPublisher());
                 }
-                let pub = mng.get(publisherId);
+                let pub = mng.get(publisherId, { localStorageMode: this.getAttribute("localStorage") || "disabled" });
                 this.dataProvider = publisherId;
                 if (this.hasAttribute("subDataProvider")) {
                     const dataPath = this.getAttribute("subDataProvider");

package/core/utils/LocationHandler.js

@@ -56,7 +56,9 @@ export default class LocationHandler {
             const origin = document.location.origin;
             const urlDest = goBack || origin;
             const isHTTP = referrer.indexOf("http") == 0;
-            const isNotSameOrigin = isHTTP ? new URL(referrer).origin != origin : false;
+            const isNotSameOrigin = isHTTP
+                ? new URL(referrer).origin != origin
+                : false;
             const isReferrerEmpty = referrer == "";
             const isFirstPage = history.length < 3; // imparfait mais variabsle selon les situations
             const isFallbackNoReferer = isReferrerEmpty && isFirstPage; // fallback pour ff qui a parfois un referer nulle ex : drupal 9
@@ -109,14 +111,18 @@ export default class LocationHandler {
      * Ajoute l'attribut "active" à l'élément si l'url correspond à la location en donction du mode d'activation
      */
     static updateComponentActiveState(component) {
-        if (component.autoActive == "disabled")
+        if (component.autoActive == "disabled") {
             return;
+        }
         if (component.href && component.href.indexOf("http") != 0) {
             const url1 = new URL(component.href, document.location.href);
             const url2 = new URL(component.location || "", document.location.origin);
             let isActive = false;
             if (component.autoActive == "strict") {
-                isActive = url1.pathname == url2.pathname && url1.hash == url2.hash && url1.search == url2.search;
+                isActive =
+                    url1.pathname == url2.pathname &&
+                        url1.hash == url2.hash &&
+                        url1.search == url2.search;
             }
             else
                 isActive = url2.href.indexOf(url1.href) == 0;