@sapui5/sap.zen.crosstab 1.107.0 → 1.108.0

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

@@ -7,11 +7,12 @@ sap.ui.define(
     "jquery.sap.global",
     "sap/ui/core/Control",
     "sap/zen/crosstab/CellStyleHandler",
+    "sap/zen/crosstab/DataCellRenderer",
     "sap/zen/crosstab/rendering/RenderingConstants",
     "sap/zen/crosstab/utils/Utils",
     "sap/zen/crosstab/library"
   ],
-  function(jQuery, Control, CellStyleHandler, RenderingConstants, Utils){
+  function(jQuery, Control, CellStyleHandler, DataCellRenderer, RenderingConstants, Utils){
     "use strict";
     // Provides control sap.zen.crosstab.DataCell.
     jQuery.sap.declare("sap.zen.crosstab.DataCell");
@@ -28,42 +29,45 @@ sap.ui.define(
      * @constructor
      * @public
      * @deprecated since 1.89.0
-     * @name sap.zen.crosstab.DataCell
+     * @alias sap.zen.crosstab.DataCell
      */
-    Control.extend("sap.zen.crosstab.DataCell", /** @lends sap.zen.crosstab.DataCell.prototype */ { metadata : {
-      library : "sap.zen.crosstab",
-      properties : {
-        /**
-         * the text of the data cell
-         */
-        text : {type : "string", group : "Misc", defaultValue : null},
+    var DataCell = Control.extend("sap.zen.crosstab.DataCell", /** @lends sap.zen.crosstab.DataCell.prototype */ {
+      metadata : {
+        library : "sap.zen.crosstab",
+        properties : {
+          /**
+           * the text of the data cell
+           */
+          text : {type : "string", group : "Misc", defaultValue : null},
 
-        /**
-         * the area of the data cell
-         */
-        area : {type : "object", group : "Misc", defaultValue : null},
+          /**
+           * the area of the data cell
+           */
+          area : {type : "object", group : "Misc", defaultValue : null},
 
-        /**
-         * the row of the data cell
-         */
-        row : {type : "int", group : "Misc", defaultValue : null},
+          /**
+           * the row of the data cell
+           */
+          row : {type : "int", group : "Misc", defaultValue : null},
 
-        /**
-         * the column of the data cell
-         */
-        col : {type : "int", group : "Misc", defaultValue : null},
+          /**
+           * the column of the data cell
+           */
+          col : {type : "int", group : "Misc", defaultValue : null},
 
-        /**
-         * the table row of the data cell
-         */
-        tableRow : {type : "int", group : "Misc", defaultValue : null},
+          /**
+           * the table row of the data cell
+           */
+          tableRow : {type : "int", group : "Misc", defaultValue : null},
 
-        /**
-         * the table column of the data cell
-         */
-        tableCol : {type : "int", group : "Misc", defaultValue : null}
-      }
-    }});
+          /**
+           * the table column of the data cell
+           */
+          tableCol : {type : "int", group : "Misc", defaultValue : null}
+        }
+      },
+      renderer: DataCellRenderer
+    });
 
 
     /**
@@ -75,11 +79,7 @@ sap.ui.define(
      * @public
      */
 
-    ///**
-    // * This file defines behavior for the control,
-    // */
-
-    sap.zen.crosstab.DataCell.prototype.init = function () {
+    DataCell.prototype.init = function () {
       "use strict";
       this.aStyles = [];
       this.bLoading = false;
@@ -88,22 +88,22 @@ sap.ui.define(
       this.sPassiveCellType = RenderingConstants.PASSIVE_CELL_TYPE_NORMAL;
       this.iNumberOfLineBreaks = 0;
     };
-    sap.zen.crosstab.DataCell.prototype.getCellType = function() {
+    DataCell.prototype.getCellType = function() {
       return RenderingConstants.TYPE_DATA_CELL;
     };
-    sap.zen.crosstab.DataCell.prototype.isHeaderCell = function() {
+    DataCell.prototype.isHeaderCell = function() {
       return false;
     };
-    sap.zen.crosstab.DataCell.prototype.getCssClassNames = function (bIsIE8, bIsRtl, bIsMsIE) {
+    DataCell.prototype.getCssClassNames = function (bIsIE8, bIsRtl, bIsMsIE) {
       return CellStyleHandler.getCssClasses(this.aStyles, bIsIE8, bIsRtl, bIsMsIE);
     };
-    sap.zen.crosstab.DataCell.prototype.getStyleIdList = function () {
+    DataCell.prototype.getStyleIdList = function () {
       return this.aStyles;
     };
-    sap.zen.crosstab.DataCell.prototype.setStyleIdList = function (aNewStyles) {
+    DataCell.prototype.setStyleIdList = function (aNewStyles) {
       this.aStyles = aNewStyles;
     };
-    sap.zen.crosstab.DataCell.prototype.addStyle = function (sStyle) {
+    DataCell.prototype.addStyle = function (sStyle) {
       var iStyleId = CellStyleHandler.getStyleId(
         sStyle,
         RenderingConstants.TYPE_DATA_CELL
@@ -112,7 +112,7 @@ sap.ui.define(
         this.aStyles.push(iStyleId);
       }
     };
-    sap.zen.crosstab.DataCell.prototype.removeStyle = function (sStyle) {
+    DataCell.prototype.removeStyle = function (sStyle) {
       var iStyleId = CellStyleHandler.getStyleId(
         sStyle, RenderingConstants.TYPE_DATA_CELL
       );
@@ -121,7 +121,7 @@ sap.ui.define(
         this.aStyles.splice(iIndex, 1);
       }
     };
-    sap.zen.crosstab.DataCell.prototype.hasStyle = function (sStyle) {
+    DataCell.prototype.hasStyle = function (sStyle) {
       var iStyleId = CellStyleHandler.getStyleId(
         sStyle, RenderingConstants.TYPE_DATA_CELL
       );
@@ -132,54 +132,54 @@ sap.ui.define(
         return true;
       }
     };
-    sap.zen.crosstab.DataCell.prototype.getColSpan = function () {
+    DataCell.prototype.getColSpan = function () {
       return 1;
     };
-    sap.zen.crosstab.DataCell.prototype.getRowSpan = function () {
+    DataCell.prototype.getRowSpan = function () {
       return 1;
     };
-    sap.zen.crosstab.DataCell.prototype.getEffectiveColSpan = function () {
+    DataCell.prototype.getEffectiveColSpan = function () {
       return 1;
     };
-    sap.zen.crosstab.DataCell.prototype.getEffectiveRowSpan = function () {
+    DataCell.prototype.getEffectiveRowSpan = function () {
       return 1;
     };
-    sap.zen.crosstab.DataCell.prototype.isLoading = function () {
+    DataCell.prototype.isLoading = function () {
       return this.bLoading;
     };
-    sap.zen.crosstab.DataCell.prototype.setLoading = function (bLoading) {
+    DataCell.prototype.setLoading = function (bLoading) {
       this.bLoading = bLoading;
     };
-    sap.zen.crosstab.DataCell.prototype.isSelectable = function () {
+    DataCell.prototype.isSelectable = function () {
       return false;
     };
-    sap.zen.crosstab.DataCell.prototype.getUnescapedText = function () {
+    DataCell.prototype.getUnescapedText = function () {
       return Utils.unEscapeDisplayString(this.getText());
     };
-    sap.zen.crosstab.DataCell.prototype.setEntryEnabled = function (bIsEntryEnabled) {
+    DataCell.prototype.setEntryEnabled = function (bIsEntryEnabled) {
       this.bIsEntryEnabled = bIsEntryEnabled;
     };
-    sap.zen.crosstab.DataCell.prototype.isEntryEnabled = function () {
+    DataCell.prototype.isEntryEnabled = function () {
       return this.bIsEntryEnabled;
     };
-    sap.zen.crosstab.DataCell.prototype.setUnit = function (sUnit) {
+    DataCell.prototype.setUnit = function (sUnit) {
       this.sUnit = sUnit;
     };
-    sap.zen.crosstab.DataCell.prototype.getUnit = function () {
+    DataCell.prototype.getUnit = function () {
       return this.sUnit;
     };
-    sap.zen.crosstab.DataCell.prototype.getPassiveCellType = function () {
+    DataCell.prototype.getPassiveCellType = function () {
       return this.sPassiveCellType;
     };
-    sap.zen.crosstab.DataCell.prototype.setPassiveCellType = function (sPCellType) {
+    DataCell.prototype.setPassiveCellType = function (sPCellType) {
       this.sPassiveCellType = sPCellType;
     };
-    sap.zen.crosstab.DataCell.prototype.setNumberOfLineBreaks = function (iNumberOfLineBreaks) {
+    DataCell.prototype.setNumberOfLineBreaks = function (iNumberOfLineBreaks) {
       this.iNumberOfLineBreaks = iNumberOfLineBreaks;
     };
-    sap.zen.crosstab.DataCell.prototype.getNumberOfLineBreaks = function () {
+    DataCell.prototype.getNumberOfLineBreaks = function () {
       return this.iNumberOfLineBreaks;
     };
-    return sap.zen.crosstab.DataCell;
+    return DataCell;
   }
 );

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

@@ -4,27 +4,27 @@
 /*global sap*/
 sap.ui.define(
   [
-    "jquery.sap.global",
     "sap/zen/crosstab/rendering/RenderingConstants",
     "sap/zen/crosstab/IDataCell"
   ],
-  function(jQuery, RenderingConstants, IDataCell){
+  function(RenderingConstants, IDataCell){
     "use strict";
-    jQuery.sap.declare("sap.zen.crosstab.DataCellRenderer");
     /**
-     * @class DataCell renderer.
-     * @static
+     * @namespace DataCell renderer.
+     * @alias sap.zen.crosstab.DataCell
      */
-    sap.zen.crosstab.DataCellRenderer = {};
+    var DataCellRenderer = {
+      apiVersion: 2
+    };
     /**
      * 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.DataCell}
      *            oControl an object representation of the control that should be rendered
      */
-    sap.zen.crosstab.DataCellRenderer.render = function (oRenderManager, oControl) {
+    DataCellRenderer.render = function (rm, oControl) {
       "use strict";
       var oArea = oControl.getArea();
       var oCrosstab = oArea.getCrosstab();
@@ -36,34 +36,28 @@ sap.ui.define(
         oAdditionalStyles = oCallbackResult.additionalStyles;
         sRenderText = oCallbackResult.renderText;
       }
-      // convenience variable
-      var rm = oRenderManager;
       // write the HTML into the render manager
-      rm.write("<td");
-      rm.writeControlData(oControl);
+      rm.openStart("td", oControl);
       var sCssClasses = oControl.getCssClassNames(oCrosstab.isIE8Mode(), oCrosstab.getPropertyBag().isRtl(), oCrosstab.getUtils().isMsIE());
-      rm.writeAttributeEscaped("class", sCssClasses);
-      rm.writeAttributeEscaped("tabindex", RenderingConstants.TABINDEX);
-      rm.write(">"); // SPAN element
-      rm.write("<div");
-      rm.writeAttributeEscaped("id", oControl.getId() + "_contentDiv");
-      rm.writeAttributeEscaped("tabindex", RenderingConstants.TABINDEX);
-      var sClasses = "sapzencrosstab-DataCellContentDiv";
+      rm.attr("class", sCssClasses);
+      rm.attr("tabindex", RenderingConstants.TABINDEX);
+      rm.openEnd(); // SPAN element
+      rm.openStart("div", oControl.getId() + "_contentDiv");
+      rm.attr("tabindex", RenderingConstants.TABINDEX);
+      rm.class("sapzencrosstab-DataCellContentDiv");
       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.sStyle(sStyleKey, oAdditionalStyles[sStyleKey]);
         }
       }
-      rm.writeStyles();
-      rm.write(">");
-      rm.writeEscaped(sRenderText);
-      rm.write("</div>");
-      rm.write("</td>");
+      rm.openEnd();
+      rm.text(sRenderText);
+      rm.close("div");
+      rm.close("td");
     };
-    return sap.zen.crosstab.DataCellRenderer;
-  }
+    return DataCellRenderer;
+  }, true
 );