@sapui5/sap.zen.crosstab 1.107.0 → 1.109.0

package/src/sap/zen/crosstab/HeaderCellRenderer.js

@@ -4,31 +4,29 @@
 /*global sap*/
 sap.ui.define(
   [
-    "jquery.sap.global",
     "sap/zen/crosstab/rendering/RenderingConstants",
     "sap/zen/crosstab/IHeaderCell",
     "sap/zen/crosstab/TextConstants",
     "sap/zen/crosstab/utils/Utils"
   ],
-  function(jQuery,RenderingConstants, IHeaderCell, TextConstants, Utils) {
+  function(RenderingConstants, IHeaderCell, TextConstants, Utils) {
     "use strict";
-    jQuery.sap.declare("sap.zen.crosstab.HeaderCellRenderer");
     /**
-     * @class HeaderCell renderer.
-     * @static
+     * @namespace HeaderCell renderer.
+     * @alias sap.zen.crosstab.HeaderCellRenderer
      */
-    sap.zen.crosstab.HeaderCellRenderer = {};
+    var HeaderCellRenderer = {
+      apiVersion: 1 // still uses rm.write to write cell content which might contain markup
+    };
     /**
      * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
      *
      * @param {sap.ui.core.RenderManager}
-     *            oRenderManager the RenderManager that can be used for writing to the Render-Output-Buffer
-     * @param {sap.ui.core.Control}
+     *            rm the RenderManager that can be used for writing to the Render-Output-Buffer
+     * @param {sap.zen.crosstab.HeaderCell}
      *            oControl an object representation of the control that should be rendered
      */
-    sap.zen.crosstab.HeaderCellRenderer.render = function (oRenderManager, oControl) {
-      // convenience variable
-      var rm = oRenderManager;
+    HeaderCellRenderer.render = function (rm, oControl) {
       var oArea = oControl.getArea();
       var fRenderCallback = oArea.getRenderCellCallback();
       var oCrosstab = oArea.getCrosstab();
@@ -53,79 +51,67 @@ sap.ui.define(
         sCssClasses += " sapzencrosstab-HeaderCellHierarchy";
       }
       // write the HTML into the render manager
-      rm.write("<td");
-      rm.writeControlData(oControl);
-      rm.writeAttributeEscaped("class", sCssClasses);
-      rm.writeAttributeEscaped("tabindex", RenderingConstants.TABINDEX);
+      rm.openStart("td", oControl);
+      rm.attr("class", sCssClasses);
+      rm.attr("tabindex", RenderingConstants.TABINDEX);
       if (iColspan > 1) {
-        rm.writeAttributeEscaped("colspan", iColspan);
+        rm.attr("colspan", iColspan);
       }
       if (iRowspan > 1) {
-        rm.writeAttributeEscaped("rowspan", iRowspan);
+        rm.attr("rowspan", iRowspan);
       }
-      rm.write(">"); // td element
+      rm.openEnd(); // td element
       // cell layout div
-      rm.write("<div");
-      rm.writeAttributeEscaped("id", oControl.getId() + "_cellLayoutDiv");
-      rm.writeAttributeEscaped("tabindex", RenderingConstants.TABINDEX);
-      rm.writeAttribute("class", "sapzencrosstab-cellLayoutDiv");
+      rm.openStart("div", oControl.getId() + "_cellLayoutDiv");
+      rm.attr("tabindex", RenderingConstants.TABINDEX);
+      rm.class("sapzencrosstab-cellLayoutDiv");
       if (oControl.isEntryEnabled()) {
         // prepare for postprocessing logic workaround in adjustColWidths of RenderEngine
-        rm.addStyle("width", "0px");
-        rm.writeStyles();
+        rm.style("width", "0px");
       }
-      rm.write(">"); // div element
+      rm.openEnd(); // div element
       if (oControl.isEntryEnabled()) {
-        rm.write("<table style='width: 100%; border-spacing: 0px;'><tbody>");
-        rm.write("<tr>");
-        rm.write("<td style='width: 100%; padding: 0px 5px 0px 0px;'>");
+        rm.openStart("table").style("width", "100%").style("border-spacing", "0px").openEnd().openStart("tbody").openEnd();
+        rm.openStart("tr").openEnd();
+        rm.openStart("td").style("width", "100%").style("padding", "0px 5px 0px 0px").openEnd();
       }
       // cell content div
-      rm.write("<div");
-      rm.writeAttributeEscaped("id", oControl.getId() + "_contentDiv");
-      rm.writeAttributeEscaped("tabindex",RenderingConstants.TABINDEX);
+      rm.openStart("div", oControl.getId() + "_contentDiv");
+      rm.attr("tabindex",RenderingConstants.TABINDEX);
       // tooltip
       if (sRenderText) {
-        rm.writeAttributeEscaped("title", sRenderText);
+        rm.attr("title", sRenderText);
       }
-      var sClasses = "sapzencrosstab-HeaderCellContentDiv";
+      rm.class("sapzencrosstab-HeaderCellContentDiv");
       if (oControl.isLoading()) {
-        sClasses += " sapzencrosstab-LoadingCellContentDiv";
+        rm.class("sapzencrosstab-LoadingCellContentDiv");
       }
-      rm.writeAttributeEscaped("class", sClasses);
       if (oAdditionalStyles) {
         for ( var sStyleKey in oAdditionalStyles) {
-          rm.addStyle(sStyleKey, oAdditionalStyles[sStyleKey]);
+          rm.style(sStyleKey, oAdditionalStyles[sStyleKey]);
         }
       }
-      rm.writeStyles();
       if (oControl.isEntryEnabled()) {
-        rm.addStyle("width", "100%");
-        rm.writeStyles();
+        rm.style("width", "100%");
       }
-      rm.write(">"); // div element
+      rm.openEnd(); // div element
       renderCellContent();
       renderColResizer();
-      rm.write("</div>"); // cell content div
-      rm.write("</div>"); // cell layout div
+      rm.close("div"); // cell content div
+      rm.close("div"); // cell layout div
       if (oControl.isEntryEnabled()) {
-        rm.write("</td>");
-        rm.write("<td style='padding: 0px'>");
-        rm.write("<div");
-        rm.writeAttributeEscaped("id", "vhlp_" + oControl.getId());
-        var sClassString = "sapzencrosstab-HeaderCellDivValueHelp";
-        if (Utils.isMainMode()) {
-          sClassString += "-MainMode";
-        }
-        sClassString += " sapzencrosstab-HeaderCellValueHelp";
-        rm.writeAttributeEscaped("class", sClassString);
-        rm.write(">");
-        rm.write("</div>");
-        rm.write("</td>");
-        rm.write("</tr>");
-        rm.write("</tbody></table>");
+        rm.close("td");
+        rm.openStart("td").style("padding", "0px").openEnd();
+        rm.openStart("div", "vhlp_" + oControl.getId());
+        rm.class("sapzencrosstab-HeaderCellDivValueHelp" + (Utils.isMainMode() ? "-MainMode" : ""));
+        rm.class("sapzencrosstab-HeaderCellValueHelp");
+        rm.openEnd();
+        rm.close("div");
+        rm.close("td");
+        rm.close("tr");
+        rm.close("tbody").close("table");
       }
-      rm.write("</td>");
+      rm.close("td");
       function renderCellContent() {
         if (sSort || sDrillState) {
           createCellContentTable(sSort, sDrillState);
@@ -134,28 +120,26 @@ sap.ui.define(
         }
       }
       function createCellContent() {
-        rm.write("<div");
-        rm.writeAttributeEscaped("id", oControl.getId() + "_textContentDiv");
-        rm.writeAttributeEscaped("tabindex", RenderingConstants.TABINDEX);
+        rm.openStart("div", oControl.getId() + "_textContentDiv");
+        rm.attr("tabindex", RenderingConstants.TABINDEX);
         // ellipsis handling when content is too large
-        rm.addStyle("overflow", "hidden");
-        rm.addStyle("text-overflow", "ellipsis");
-        rm.writeStyles();
-        rm.write(">");
+        rm.style("overflow", "hidden");
+        rm.style("text-overflow", "ellipsis");
+        rm.openEnd();
         rm.write(sRenderText);
-        rm.write("</div>");
+        rm.close("div");
       }
       function createCellContentTable() {
-        rm.write("<table><tbody>");
+        rm.openStart("table").openEnd().openStart("tbody").openEnd();
         insertColHeaderHierarchySpacerLinesBefore();
-        rm.write("<tr>");
+        rm.openStart("tr").openEnd();
         insertHierarchyActionImage();
         insertTextContent();
         insertSortingImage();
         insertRowHeaderHierarchSpacerDivAfter();
-        rm.write("</tr>");
+        rm.close("tr");
         insertColHeaderHierarchySpacerLinesAfter();
-        rm.write("</tbody></table>");
+        rm.close("tbody").close("table");
       }
       function insertHierarchyActionImage() {
         if (sDrillState) {
@@ -182,69 +166,67 @@ sap.ui.define(
           if (iLevel > 0) {
             if (isRowHeaderArea) {
               var iWidth = iLevel * oCrosstab.getHierarchyIndentWidth();
-              rm.write("<td>");
-              rm.write("<div");
-              rm.writeAttributeEscaped("tabindex", RenderingConstants.TABINDEX);
-              rm.addStyle("width", iWidth + "px");
-              rm.writeAttribute("class", "sapzencrosstab-HierarchySpacerDivBefore");
-              rm.writeAttributeEscaped("xtabspacer-cellid", oControl.getId());
-              rm.writeStyles();
-              rm.write("></div>");
-              rm.write("</td>");
+              rm.openStart("td").openEnd();
+              rm.openStart("div");
+              rm.attr("tabindex", RenderingConstants.TABINDEX);
+              rm.style("width", iWidth + "px");
+              rm.class("sapzencrosstab-HierarchySpacerDivBefore");
+              rm.attr("xtabspacer-cellid", oControl.getId());
+              rm.openEnd().close("div");
+              rm.close("td");
             }
           }
           if ((sDrillState === "L" && iLevel > 0) || sDrillState !== "L") {
-            rm.write("<td>");
-            rm.write("<div");
+            rm.openStart("td").openEnd();
             if (oControl.getHierarchyAction()) {
-              rm.writeAttributeEscaped("id", "hier_" + oControl.getId());
+              rm.openStart("div", "hier_" + oControl.getId());
+            } else {
+              rm.openStart("div");
             }
-            rm.writeAttributeEscaped("class", sClass);
+            rm.attr("class", sClass);
             // Tooltip
             var sHierarchyTooltip = oControl.getHierarchyTooltip();
             if (sHierarchyTooltip) {
-              rm.writeAttributeEscaped("title", sHierarchyTooltip);
+              rm.attr("title", sHierarchyTooltip);
             }
-            rm.write("></div>");
-            rm.write("</td>");
+            rm.openEnd().close("div");
+            rm.close("td");
           }
         }
       }
       function insertTextContent() {
-        rm.write("<td>");
+        rm.openStart("td").openEnd();
         createCellContent();
-        rm.write("</td>");
+        rm.close("td");
       }
       function createSortingImage() {
         if (sSort) {
           var iTextIndex = 0;
-          var sClass = "sapzencrosstab-HeaderCellDivSortable ";
-          rm.write("<div");
+          rm.openStart("div", "sort_" + oControl.getId());
+          rm.class("sapzencrosstab-HeaderCellDivSortable");
           if (sSort === "NONE") {
-            sClass += "sapzencrosstab-HeaderCellSortNone";
+            rm.class("sapzencrosstab-HeaderCellSortNone");
             iTextIndex = 0;
           } else if (sSort === "ASC") {
-            sClass += "sapzencrosstab-HeaderCellSortAsc";
+            rm.class("sapzencrosstab-HeaderCellSortAsc");
             iTextIndex = 1;
           } else if (sSort === "DESC") {
-            sClass += "sapzencrosstab-HeaderCellSortDesc";
+            rm.class("sapzencrosstab-HeaderCellSortDesc");
             iTextIndex = 2;
           }
-          rm.writeAttributeEscaped("class", sClass);
-          rm.writeAttribute("id", "sort_" + oControl.getId());
           // Tooltip
           var sSortTooltip = oCrosstab.getPropertyBag().getSortingToolTip(iTextIndex);
           if (sSortTooltip) {
-            rm.writeAttributeEscaped("title", sSortTooltip);
+            rm.attr("title", sSortTooltip);
           }
-          rm.write("></div>");
+          rm.openEnd().close("div");
         }
       }
       function insertSortingImage() {
         if (sSort) {
-          rm.write("<td>");
+          rm.openStart("td").openEnd();
           createSortingImage();
-          rm.write("</td>");
+          rm.close("td");
         }
       }
       function insertRowHeaderHierarchSpacerDivAfter () {
@@ -254,15 +236,14 @@ sap.ui.define(
           var iDiff = iMaxLevel - iLevel;
           if (iDiff > 0) {
             var iWidth = iDiff * oCrosstab.getHierarchyIndentWidth();
-            rm.write("<td>");
-            rm.write("<div");
-            rm.writeAttributeEscaped("tabindex", RenderingConstants.TABINDEX);
-            rm.addStyle("width", iWidth + "px");
-            rm.writeAttribute("class", "sapzencrosstab-HierarchySpacerDivAfter");
-            rm.writeAttributeEscaped("xtabspacer-cellid", oControl.getId());
-            rm.writeStyles();
-            rm.write("></div>");
-            rm.write("</td>");
+            rm.openStart("td").openEnd();
+            rm.openStart("div");
+            rm.attr("tabindex", RenderingConstants.TABINDEX);
+            rm.style("width", iWidth + "px");
+            rm.class("sapzencrosstab-HierarchySpacerDivAfter");
+            rm.attr("xtabspacer-cellid", oControl.getId());
+            rm.openEnd().close("div");
+            rm.close("td");
           }
         }
       }
@@ -271,15 +252,14 @@ sap.ui.define(
           var iLevel = oControl.getLevel();
           if (iLevel > 0 && oControl.getArea().isColHeaderArea()) {
             var iHeight = iLevel * oCrosstab.getHierarchyIndentHeight();
-            rm.write("<tr><td>");
-            rm.write("<div");
-            rm.writeAttributeEscaped("tabindex", RenderingConstants.TABINDEX);
-            rm.writeAttribute("class", "sapzencrosstab-HierarchySpacerLinesBefore");
-            rm.writeAttributeEscaped("xtabspacer-cellid", oControl.getId());
-            rm.addStyle("height", iHeight + "px");
-            rm.writeStyles();
-            rm.write("></div>");
-            rm.write("</td></tr>");
+            rm.openStart("tr").openEnd().openStart("td").openEnd();
+            rm.openStart("div");
+            rm.attr("tabindex", RenderingConstants.TABINDEX);
+            rm.class("sapzencrosstab-HierarchySpacerLinesBefore");
+            rm.attr("xtabspacer-cellid", oControl.getId());
+            rm.style("height", iHeight + "px");
+            rm.openEnd().close("div");
+            rm.close("td").close("tr");
           }
         }
       }
@@ -290,15 +270,14 @@ sap.ui.define(
           var iDiff = iMaxLevel - iLevel;
           if (iDiff > 0) {
             var iHeight = iDiff * oCrosstab.getHierarchyIndentHeight();
-            rm.write("<tr><td>");
-            rm.write("<div");
-            rm.writeAttributeEscaped("tabindex", RenderingConstants.TABINDEX);
-            rm.writeAttribute("class", "sapzencrosstab-HierarchySpacerLinesAfter");
-            rm.writeAttributeEscaped("xtabspacer-cellid", oControl.getId());
-            rm.addStyle("height", iHeight + "px");
-            rm.writeStyles();
-            rm.write("></div>");
-            rm.write("</td></tr>");
+            rm.openStart("tr").openEnd().openStart("td").openEnd();
+            rm.openStart("div");
+            rm.attr("tabindex", RenderingConstants.TABINDEX);
+            rm.class("sapzencrosstab-HierarchySpacerLinesAfter");
+            rm.attr("xtabspacer-cellid", oControl.getId());
+            rm.style("height", iHeight + "px");
+            rm.openEnd().close("div");
+            rm.close("td").close("tr");
           }
         }
       }
@@ -309,24 +288,25 @@ sap.ui.define(
               oControl.setMobileResize(true);
             } else {
               // resize handle div
-              rm.write("<div");
-              rm.writeAttributeEscaped("id", "resi_" + oControl.getId());
+              rm.openStart("div", "resi_" + oControl.getId());
               if(sSort){
                 //Some themes need a different spacing for the resize handle if a sort icon is present in the same cell
-                rm.writeAttribute("class", "sapzencrosstab-columnResizeHandleWithSort");
+                rm.class("sapzencrosstab-columnResizeHandleWithSort");
               } else {
-                rm.writeAttribute("class", "sapzencrosstab-columnResizeHandle");
+                rm.class("sapzencrosstab-columnResizeHandle");
               }
-              rm.writeAttributeEscaped("title", oCrosstab.getPropertyBag().getText(
+              rm.attr("title", oCrosstab.getPropertyBag().getText(
                 TextConstants.COLWIDTH_ADJUST_TEXT_KEY));
-              rm.write(">"); // div element
-              rm.write("</div>");
+              rm.openEnd(); // div element
+              rm.close("div");
               oControl.setMobileResize(false);
             }
           }
         }
       }
     };
-    return sap.zen.crosstab.HeaderCellRenderer;
-  }
+
+    return HeaderCellRenderer;
+
+  }, true
 );

package/src/sap/zen/crosstab/library.js

@@ -33,7 +33,7 @@ sap.ui.define(
         "sap.zen.crosstab.HeaderCell"
       ],
       elements: [],
-      version: "1.107.0"
+      version: "1.109.0"
     });
     return thisLib;
   }

package/src/sap/zen/crosstab/themes/base/Chart.less

@@ -3,6 +3,10 @@
 	pointer-events: none;
 }
 
+.zenControl .sapzeninfochart .v-m-tooltip {
+	pointer-events: all;
+}
+
 .zenControl .html5chart svg {
 	overflow: hidden;
 }

package/src/sap/zen/crosstab/utils/Utils.js

@@ -10,8 +10,7 @@ sap.ui.define(
   ],
   function(jQuery, Log,RenderingConstants) {
     "use strict";
-    jQuery.sap.declare("sap.zen.crosstab.utils.Utils");
-    sap.zen.crosstab.utils.Utils = function (oCrosstab) {
+    var Utils = function (oCrosstab) {
       var that = this;
       var sQueuedHeaderWidthCommand = null;
       var oProfiles = {};
@@ -271,45 +270,45 @@ sap.ui.define(
       };
     };
 
-    sap.zen.crosstab.utils.Utils.isCozyMode = function() {
+    Utils.isCozyMode = function() {
       var bIsCozyMode = false;
 
-      if (sap.zen.crosstab.utils.Utils.isDispatcherAvailable() === true) {
+      if (Utils.isDispatcherAvailable() === true) {
         bIsCozyMode = sap.zen.Dispatcher.instance.isMainMode() && !sap.zen.Dispatcher.instance.isCompactMode();
       }
       return bIsCozyMode;
     };
 
-    sap.zen.crosstab.utils.Utils.isMainMode = function() {
+    Utils.isMainMode = function() {
       return true;
     };
 
-    sap.zen.crosstab.utils.Utils.unEscapeDisplayString = function (sHtmlString) {
+    Utils.unEscapeDisplayString = function (sHtmlString) {
       var sUnEscapedString = sHtmlString.replace(/<br\/>/g, "\r\n");
       sUnEscapedString = sUnEscapedString.replace(/&nbsp;/g, "&#x20;");
       sUnEscapedString = jQuery("<div></div>").html(sUnEscapedString).text();
       return sUnEscapedString;
     };
 
-    sap.zen.crosstab.utils.Utils.prepareStringForRendering = function (sText) {
+    Utils.prepareStringForRendering = function (sText) {
       var sPrePreparedString = sText.replace(/(\r\n)|(\n\r)|\r|\n/g, "<br/>");
       var sPreparedString = sPrePreparedString.replace(/(&#xd;&#xa;)|(&#xa;&#xd;)|&#xd;|&#xa;/g, "<br/>");
-      var iNumberOfLineBreaks = sap.zen.crosstab.utils.Utils.getNumberOfLineBreaks(sPreparedString);
+      var iNumberOfLineBreaks = Utils.getNumberOfLineBreaks(sPreparedString);
 
       sPreparedString = sPreparedString.replace(/&#x20;/g, "&nbsp;");
       return {"text" : sPreparedString, "iNumberOfLineBreaks" : iNumberOfLineBreaks};
     };
 
-    sap.zen.crosstab.utils.Utils.cancelEvent = function (e) {
+    Utils.cancelEvent = function (e) {
       if (e) {
         if (e.preventDefault) {
           e.preventDefault();
         }
-        sap.zen.crosstab.utils.Utils.stopEventPropagation(e);
+        Utils.stopEventPropagation(e);
       }
     };
 
-    sap.zen.crosstab.utils.Utils.stopEventPropagation = function (e) {
+    Utils.stopEventPropagation = function (e) {
       if (e) {
         if (e.stopPropagation) {
           e.stopPropagation();
@@ -320,7 +319,7 @@ sap.ui.define(
       }
     };
 
-    sap.zen.crosstab.utils.Utils.hasEntries = function (oAssocArray) {
+    Utils.hasEntries = function (oAssocArray) {
       var bHasEntries = false;
       if (oAssocArray) {
         for ( var key in oAssocArray) {
@@ -335,7 +334,7 @@ sap.ui.define(
       return bHasEntries;
     };
 
-    sap.zen.crosstab.utils.Utils.padWithZeroes = function (iNumber, iLength) {
+    Utils.padWithZeroes = function (iNumber, iLength) {
       var s = iNumber.toString();
       if (s.length < iLength) {
         s = ("0000000000" + s).slice(-iLength);
@@ -343,7 +342,7 @@ sap.ui.define(
       return s;
     };
 
-    sap.zen.crosstab.utils.Utils.selectTextInElement = function (oDomTextContainer) {
+    Utils.selectTextInElement = function (oDomTextContainer) {
       var oRange;
       var oSelection;
       if (oDomTextContainer.innerHTML) {
@@ -372,7 +371,7 @@ sap.ui.define(
       }
     };
 
-    sap.zen.crosstab.utils.Utils.getWidthFromStyle = function (oJqElement) {
+    Utils.getWidthFromStyle = function (oJqElement) {
       var i = 0;
       var sStyle = "";
       var aStyleDef = null;
@@ -399,11 +398,11 @@ sap.ui.define(
       return sWidth;
     };
 
-    sap.zen.crosstab.utils.Utils.sign = function(x) {
+    Utils.sign = function(x) {
       return x > 0 ? 1 : x < 0 ? -1 : 0;
     };
 
-    sap.zen.crosstab.utils.Utils.getCssIntProperty = function(oJqElement, sCss) {
+    Utils.getCssIntProperty = function(oJqElement, sCss) {
       var iCssProperty = 0;
       if (oJqElement && oJqElement.length > 0) {
         iCssProperty = parseInt(oJqElement.css(sCss), 10);
@@ -414,15 +413,15 @@ sap.ui.define(
       return iCssProperty;
     };
 
-    sap.zen.crosstab.utils.Utils.getWidthOfMarginBorderPadding = function(oJqElement) {
-      var iMarginWidth = sap.zen.crosstab.utils.Utils.getCssIntProperty(oJqElement, "margin-left") + sap.zen.crosstab.utils.Utils.getCssIntProperty(oJqElement, "margin-right");
-      var iBorderWidth = sap.zen.crosstab.utils.Utils.getCssIntProperty(oJqElement, "border-left") + sap.zen.crosstab.utils.Utils.getCssIntProperty(oJqElement, "border-right");
-      var iPaddingWidth = sap.zen.crosstab.utils.Utils.getCssIntProperty(oJqElement, "padding-left") + sap.zen.crosstab.utils.Utils.getCssIntProperty(oJqElement, "padding-right");
+    Utils.getWidthOfMarginBorderPadding = function(oJqElement) {
+      var iMarginWidth = Utils.getCssIntProperty(oJqElement, "margin-left") + Utils.getCssIntProperty(oJqElement, "margin-right");
+      var iBorderWidth = Utils.getCssIntProperty(oJqElement, "border-left") + Utils.getCssIntProperty(oJqElement, "border-right");
+      var iPaddingWidth = Utils.getCssIntProperty(oJqElement, "padding-left") + Utils.getCssIntProperty(oJqElement, "padding-right");
       var iTotalWidth = iMarginWidth + iBorderWidth + iPaddingWidth;
       return iTotalWidth;
     };
 
-    sap.zen.crosstab.utils.Utils.getNumberOfLineBreaks = function(sEscapedString) {
+    Utils.getNumberOfLineBreaks = function(sEscapedString) {
       var counter = 0;
       if (sEscapedString && sEscapedString.length > 0) {
         var regEx = /<br\/>/g;
@@ -432,7 +431,7 @@ sap.ui.define(
       }
       return counter;
     };
-    sap.zen.crosstab.utils.Utils.getSizeOf = function(oObject) {
+    Utils.getSizeOf = function(oObject) {
       var iSize = 0;
       for (var key in oObject) {
         if (
@@ -443,7 +442,7 @@ sap.ui.define(
       }
       return iSize;
     };
-    sap.zen.crosstab.utils.Utils.isDispatcherAvailable = function() {
+    Utils.isDispatcherAvailable = function() {
       var bDispatcherAvailable = false;
       if (typeof sap !== "undefined" && sap) {
         if (typeof sap.zen !== "undefined" && sap.zen) {
@@ -457,7 +456,7 @@ sap.ui.define(
       return bDispatcherAvailable;
     };
 
-    sap.zen.crosstab.utils.Utils.swapText = function(sText, sSeparator) {
+    Utils.swapText = function(sText, sSeparator) {
       var aTextParts;
       var i;
       var sNewText = "";
@@ -474,11 +473,11 @@ sap.ui.define(
       }
       return sNewText;
     };
-    sap.zen.crosstab.utils.Utils.swapPivotKeyText = function(sText) {
+    Utils.swapPivotKeyText = function(sText) {
       var sNewText;
-      sNewText = sap.zen.crosstab.utils.Utils.swapText(sText, "&nbsp;&#x7c;&nbsp;");
+      sNewText = Utils.swapText(sText, "&nbsp;&#x7c;&nbsp;");
       return sNewText;
     };
-    return sap.zen.crosstab.utils.Utils;
-  }
+    return Utils;
+  }, true
 );