flexmonster 2.9.60 → 2.9.62

package/toolbar/flexmonster.toolbar.js

@@ -1,6 +1,6 @@
 /** 
  * Flexmonster Pivot Table & Charts [https://www.flexmonster.com/]
- * September 2023 (v. 2.9.60)
+ * October 2023 (v. 2.9.62)
  * Copyright (c) 2023 Flexmonster. All rights reserved.
  *
  * Flexmonster Pivot Table & Charts commercial licenses may be obtained at
@@ -513,7 +513,7 @@ FlexmonsterToolbar.prototype.init = function () {
         var fullscreenTab = _this.pivotContainer.querySelector("#fm-tab-fullscreen");
         if (fullscreenTab) {
             var isFullscreen = _this.isFullscreen();
-            fullscreenTab.querySelector(".fm-svg-icon").innerHTML = isFullscreen ? _this.icons.minimize : _this.icons.fullscreen;
+            fullscreenTab.querySelector(".fm-svg-icon").innerHTML = _this.toTrustedHtml(isFullscreen ? _this.icons.minimize : _this.icons.fullscreen);
             _this.setText(fullscreenTab.querySelector(".fm-tab-label"), isFullscreen ? _this.Labels.minimize : _this.Labels.fullscreen);
         }
     }
@@ -1320,7 +1320,7 @@ FlexmonsterToolbar.prototype.defaults.numberFormatting = {
 }
 FlexmonsterToolbar.prototype.ConfirmationPopUp = function () { }
 FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, measureAggregation) {
-    var self = this;
+    var _this = this;
     var Labels = this.Labels;
     var currentFormatVO = undefined;
 
@@ -1334,8 +1334,8 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         negativeCurrencyFormatDropDown.setEnabled(isEnabled);
         negativeNumberFormatDropDown.setEnabled(isEnabled);
         isPercentDropdown.setEnabled(isEnabled);
-        self.setEnabled(currencySymbInput, isEnabled);
-        self.setEnabled(nullValueInput, isEnabled);
+        _this.setEnabled(currencySymbInput, isEnabled);
+        _this.setEnabled(nullValueInput, isEnabled);
     }
 
     function applyCurrencySymbol(dataProvider, currencySymbol) {
@@ -1390,7 +1390,7 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
 
     ConfirmationPopUp.prototype.createPopUp = function () {
         if (this.dialog == null) {
-            this.dialog = self.popupManager.createPopup(this);
+            this.dialog = _this.popupManager.createPopup(this);
             this.dialog.content.style.zIndex = 152;
         }
     }
@@ -1398,15 +1398,15 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
     ConfirmationPopUp.prototype.addPopUp = function () {
         var popup = this.dialog.content;
         this.modalOverlay = this.createModalOverlay();
-        self.toolbarWrapper.appendChild(popup);
-        self.toolbarWrapper.appendChild(this.modalOverlay);
-        self.popupManager.addLayoutClasses(popup);
-        self.popupManager.centerPopup(popup);
-        var _this = this;
+        _this.toolbarWrapper.appendChild(popup);
+        _this.toolbarWrapper.appendChild(this.modalOverlay);
+        _this.popupManager.addLayoutClasses(popup);
+        _this.popupManager.centerPopup(popup);
+        var self = this;
         popup.resizeHandler = function () {
             if (!popup) return;
-            _this.addLayoutClasses(popup);
-            _this.centerPopup(popup);
+            self.addLayoutClasses(popup);
+            self.centerPopup(popup);
         };
         window.addEventListener("resize", popup.resizeHandler);
     }
@@ -1427,7 +1427,7 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         ], false, this.removePopUp);
         var content = document.createElement("div");
         var contentLabel = document.createElement("label");
-        contentLabel.innerHTML = Labels.confirm_message;
+        contentLabel.innerHTML = _this.toTrustedHtml(Labels.confirm_message);
         contentLabel.style.fontSize = "14px";
         content.appendChild(contentLabel);
         this.dialog.setContent(content);
@@ -1436,11 +1436,11 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
     ConfirmationPopUp.prototype.removePopUp = function (popup) {
         var popupWindow = (popup || confirmPopUp.dialog.content);
         if (confirmPopUp.modalOverlay != null) {
-            self.toolbarWrapper.removeChild(confirmPopUp.modalOverlay);
+            _this.toolbarWrapper.removeChild(confirmPopUp.modalOverlay);
             confirmPopUp.modalOverlay = null;
         }
         if (popupWindow != null) {
-            self.toolbarWrapper.removeChild(popupWindow);
+            _this.toolbarWrapper.removeChild(popupWindow);
             confirmPopUp.dialog = null;
             window.removeEventListener("resize", popupWindow.resizeHandler);
         }
@@ -1451,9 +1451,9 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         modalOverlay.style.zIndex = 151;
         modalOverlay.classList.add("fm-modal-overlay");
         modalOverlay.classList.add("fm-popup-confirm-modal-overlay");
-        var _this = this;
+        var self = this;
         modalOverlay.addEventListener('click', function (e) {
-            _this.removePopUp(_this.dialog.content);
+            self.removePopUp(self.dialog.content);
             restoreEditedMeasure();
         });
         return modalOverlay;
@@ -1481,11 +1481,11 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
     }
 
     function isStringDataMode() {
-        var options = self.pivot.getOptions({
+        var options = _this.pivot.getOptions({
             withDefaults: true
         });
         if (options.grid.type === "flat" && currentMeasureNames && currentMeasureNames.length > 0) {
-            var measures = self.pivot.getMeasures();
+            var measures = _this.pivot.getMeasures();
             var currentMeasure = null;
             for (var i = 0; i < measures.length; i++) {
                 if (currentMeasureNames.indexOf(measures[i].uniqueName) !== -1) {
@@ -1524,8 +1524,8 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         currentMeasureNames = valuesDropDown.getValue();
         var currentMeasure = currentMeasureNames ? getMeasureFromUniqueName(currentMeasureNames[0]) : null;
         var formatVO = currentMeasure ?
-            self.pivot.getFormat(currentMeasure[0], currentMeasure[1]) :
-            self.pivot.getFormat(null);
+            _this.pivot.getFormat(currentMeasure[0], currentMeasure[1]) :
+            _this.pivot.getFormat(null);
         currentFormatVO = formatVO;
 
         applyStringDataMode(isStringDataMode());
@@ -1535,9 +1535,9 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         decimalSepDropDown.setValue(formatVO.decimalSeparator);
         decimalPlacesDropDown.setValue(formatVO.decimalPlaces);
         currencySymbInput.value = formatVO.currencySymbol;
-        positiveCurrencyFormatDropDown.setDataProvider(applyCurrencySymbol(self.defaults.numberFormatting.positiveCurrencyFormats, formatVO.currencySymbol));
+        positiveCurrencyFormatDropDown.setDataProvider(applyCurrencySymbol(_this.defaults.numberFormatting.positiveCurrencyFormats, formatVO.currencySymbol));
         positiveCurrencyFormatDropDown.setValue(formatVO.positiveCurrencyFormat);
-        negativeCurrencyFormatDropDown.setDataProvider(applyCurrencySymbol(self.defaults.numberFormatting.negativeCurrencyFormats, formatVO.currencySymbol));
+        negativeCurrencyFormatDropDown.setDataProvider(applyCurrencySymbol(_this.defaults.numberFormatting.negativeCurrencyFormats, formatVO.currencySymbol));
         negativeCurrencyFormatDropDown.setValue(formatVO.negativeCurrencyFormat);
         negativeNumberFormatDropDown.setValue(formatVO.negativeNumberFormat);
         nullValueInput.value = formatVO.nullValue;
@@ -1553,7 +1553,7 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         }
     }
     var applyHandler = function () {
-        var currentReport = (currentFormatVO.name != "" || valuesDropDown.getValue()[0] == "") ? self.pivot.getReport() : {};
+        var currentReport = (currentFormatVO.name != "" || valuesDropDown.getValue()[0] == "") ? _this.pivot.getReport() : {};
         var formatVO = undefined;
         if (currentReport.hasOwnProperty("formats") && currentReport.formats.length > 0) {
             for (var i = 0; i < currentReport.formats.length; i++) {
@@ -1578,9 +1578,9 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         var measure = null;
         for (var i = 0; i < measuresList.length; i++) {
             measure = getMeasureFromUniqueName(measuresList[i]);
-            self.pivot.setFormat(formatVO,
+            _this.pivot.setFormat(formatVO,
                 (measure[0] == "" ? null : measure[0]),
-                (self.singleAggregationFormatting ? undefined : measure[1]));
+                (_this.singleAggregationFormatting ? undefined : measure[1]));
         }
         // if (valuesDropDown.getValue() === "" && currentReport.hasOwnProperty("formats")) {
         //     var reportMeasures = currentReport.slice.measures;
@@ -1590,7 +1590,7 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         //         }
         //     }
         // }
-        self.pivot.refresh();
+        _this.pivot.refresh();
     }
 
     var MEASURE_UNIQUENAME_DELIMETER = "_@@_@@_@@_";
@@ -1609,7 +1609,7 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         var aggregation = aggregationLabelIndex === -1 || measure.aggregation === "none" || measure.calculated ?
             null :
             measure.availableAggregationsCaptions[aggregationLabelIndex];
-        return aggregation === null || self.singleAggregationFormatting ?
+        return aggregation === null || _this.singleAggregationFormatting ?
             measure.name :
             measure.name + " (" + aggregation + ")";
     }
@@ -1641,7 +1641,7 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         label: Labels.default_value
     }];
     var _uniqueNames = {};
-    var _measures = self.pivot.getMeasures();
+    var _measures = _this.pivot.getMeasures();
     for (var i = 0; i < _measures.length; i++) {
         if (!_uniqueNames[_measures[i].uniqueName] ||
             (_uniqueNames[_measures[i].uniqueName] && !_uniqueNames[_measures[i].uniqueName][_measures[i].aggregation] && !this.singleAggregationFormatting)) {
@@ -1725,10 +1725,10 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
             negativeCurrencyRow.classList.remove("fm-hide");
             negativeNumberRow.classList.add("fm-hide");
             var positiveCurrencyFormat = positiveCurrencyFormatDropDown.getValue();
-            positiveCurrencyFormatDropDown.setDataProvider(applyCurrencySymbol(self.defaults.numberFormatting.positiveCurrencyFormats, value));
+            positiveCurrencyFormatDropDown.setDataProvider(applyCurrencySymbol(_this.defaults.numberFormatting.positiveCurrencyFormats, value));
             positiveCurrencyFormatDropDown.setValue(positiveCurrencyFormat);
             var negativeCurrencyFormat = negativeCurrencyFormatDropDown.getValue();
-            negativeCurrencyFormatDropDown.setDataProvider(applyCurrencySymbol(self.defaults.numberFormatting.negativeCurrencyFormats, value));
+            negativeCurrencyFormatDropDown.setDataProvider(applyCurrencySymbol(_this.defaults.numberFormatting.negativeCurrencyFormats, value));
             negativeCurrencyFormatDropDown.setValue(negativeCurrencyFormat);
         } else {
             positiveCurrencyRow.classList.add("fm-hide");
@@ -1757,14 +1757,14 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
 }
 // Conditional formatting
 FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measureName) {
-    var self = this;
+    var _this = this;
     var Labels = this.Labels;
     var conditions = this.pivot.getAllConditions();
     var dataType = this.pivot.getReport().dataSource.type;
     var isMSAS = dataType === "microsoft analysis services" || dataType === "mondrian";
 
-    var _allMeasures = self.pivot.getAllMeasures();
-    var _measures = self.pivot.getMeasures();
+    var _allMeasures = _this.pivot.getAllMeasures();
+    var _measures = _this.pivot.getMeasures();
     var _conditionsMeasuresMap = {};
     var _uniqueNames = [];
     var _measureWithAggregations = {};
@@ -1804,14 +1804,14 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
     _measureWithAggregations = undefined;
 
     var applyHandler = function () {
-        self.pivot.removeAllConditions();
+        _this.pivot.removeAllConditions();
         for (var i = 0; i < conditions.length; i++) {
             var formula = composeFormula(conditions[i].sign, conditions[i].value1, conditions[i].value2, [conditions[i].measure, conditions[i].aggregation]);
             if (formula == null) return;
             conditions[i].formula = formula;
-            self.pivot.addCondition(conditions[i]);
+            _this.pivot.addCondition(conditions[i]);
         }
-        self.pivot.refresh();
+        _this.pivot.refresh();
     };
     var onAddConditionBtnClick = function () {
         var condition = {
@@ -1826,14 +1826,14 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
             }
         };
         conditions.unshift(condition);
-        var item = self.createConditionalFormattingItem(condition, conditions, isMSAS);
+        var item = _this.createConditionalFormattingItem(condition, conditions, isMSAS);
         content.insertBefore(item, content.firstChild);
         item.focus();
         content.scrollTop = 0;
         if (conditions.length > 0) {
             placeholder.style.display = "none";
         }
-        self.popupManager.centerPopup(dialog.content);
+        _this.popupManager.centerPopup(dialog.content);
     };
 
     var composeFormula = function (sign, value1, value2, measureWithAggregation) {
@@ -1938,7 +1938,7 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
             if (conditions.length == 0) {
                 placeholder.style.display = "block";
             }
-            self.popupManager.centerPopup(dialog.content);
+            _this.popupManager.centerPopup(dialog.content);
         }
     }
 
@@ -1948,7 +1948,7 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
 
     var message = document.createElement("div");
     message.classList.add("fm-popup-placeholder-text");
-    self.setText(message, Labels.no_active_conditions);
+    _this.setText(message, Labels.no_active_conditions);
     placeholder.appendChild(message);
 
     var addConditionBtn2 = document.createElement("button");
@@ -1958,7 +1958,7 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
     addConditionBtn2.classList.add("fm-ui-btn-light");
     addConditionBtn2.classList.add("fm-button-add-large");
     addConditionBtn2.onclick = onAddConditionBtnClick;
-    self.setText(addConditionBtn2, Labels.add_condition_button);
+    _this.setText(addConditionBtn2, Labels.add_condition_button);
     var icon = document.createElement("span");
     icon.classList.add("fm-icon");
     icon.classList.add("fm-icon-act_add");
@@ -1971,7 +1971,7 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
         conditions[i].value2 = formula.value2;
         conditions[i].sign = formula.sign;
         conditions[i].measures = measures;
-        content.appendChild(self.createConditionalFormattingItem(conditions[i], conditions, isMSAS));
+        content.appendChild(_this.createConditionalFormattingItem(conditions[i], conditions, isMSAS));
     }
     if (conditions.length > 0) {
         placeholder.style.display = "none";
@@ -2641,6 +2641,15 @@ FlexmonsterToolbar.prototype.setText = function (target, text) {
         target.textContent = text;
     }
 }
+FlexmonsterToolbar.prototype.toTrustedHtml = function (html) {
+    if (window['trustedTypes']) {
+        var htmlPolicy = window['trustedTypes'].createPolicy("fmHtmlPolicy", {
+            createHTML: function(x) { return x; }
+        });
+        return htmlPolicy.createHTML(html);
+    }
+    return html;
+}
 FlexmonsterToolbar.prototype.makeSelectableByKeyboard = function (element) {
     element.setAttribute("tabindex", "0");
     element.addEventListener("keyup", function (e) {
@@ -2758,6 +2767,7 @@ FlexmonsterToolbar.prototype.createSelect = function (dataProvider, placeholder,
     if (placeholder === undefined) {
         placeholder = "";
     }
+    var _this = this;
     var _dataProvider = dataProvider;
     var _selectedItemIndexes = [];
     var _activeItemIndex = -1;
@@ -2780,7 +2790,7 @@ FlexmonsterToolbar.prototype.createSelect = function (dataProvider, placeholder,
     dropdownButton.addEventListener("click", onDropdownButtonClick);
     dropdownButton.addEventListener("keydown", onDropdownButtonKeyDown);
     dropdownButton.addEventListener("blur", hide);
-    dropdownButton.innerHTML = placeholder;
+    dropdownButton.innerHTML = _this.toTrustedHtml(placeholder);
     dropdown.appendChild(dropdownButton);
     dropdown.dropdownButton = dropdownButton;
 
@@ -2902,7 +2912,7 @@ FlexmonsterToolbar.prototype.createSelect = function (dataProvider, placeholder,
                 label = typeof data === "string" ? data : data.label;
             }
         }
-        dropdownButton.innerHTML = label;
+        dropdownButton.innerHTML = _this.toTrustedHtml(label);
     }
 
     function setActiveItemAt(index) {
@@ -2975,12 +2985,12 @@ FlexmonsterToolbar.prototype.createSelect = function (dataProvider, placeholder,
     dropdown.setDataProvider = function (dataProvider) {
         _dataProvider = dataProvider;
         _selectedItemIndexes.length = 0;
-        dropdownList.innerHTML = "";
+        dropdownList.innerHTML = _this.toTrustedHtml("");
         for (var i = 0; i < dataProvider.length; i++) {
             var data = dataProvider[i];
             var li = document.createElement("li");
             li.id = dropdownList.id + i;
-            li.innerHTML = typeof data === "string" ? data : data.label;
+            li.innerHTML = _this.toTrustedHtml(typeof data === "string" ? data : data.label);
             li.classList.add("fm-ui");
             li.classList.add("fm-ui-element");
             li.setAttribute("role", "option");
@@ -3078,7 +3088,7 @@ FlexmonsterToolbar.prototype.createTab = function (data, parent) {
         var svgIcon = document.createElement("div");
         svgIcon.classList.add("fm-svg-icon");
         svgIcon.setAttribute("aria-hidden", "true");
-        svgIcon.innerHTML = data.icon;
+        svgIcon.innerHTML = this.toTrustedHtml(data.icon);
         tabLink.appendChild(svgIcon);
     }
 
@@ -3140,7 +3150,7 @@ FlexmonsterToolbar.prototype.createSubmenuItem = function (data, parentTab) {
         var svgIcon = document.createElement("span");
         svgIcon.classList.add("fm-svg-icon");
         svgIcon.setAttribute("aria-hidden", "true");
-        svgIcon.innerHTML = data.icon;
+        svgIcon.innerHTML = _this.toTrustedHtml(data.icon);
         tab.appendChild(svgIcon);
     }
 
@@ -3496,7 +3506,7 @@ FlexmonsterToolbar.PopupManager.PopupWindow = function (popupManager) {
         contentPanel.appendChild(focusGuardBottom);
     }
     this.setToolbar = function (buttons, toHeader, removePopupHandler) {
-        toolbar.innerHTML = "";
+        toolbar.innerHTML = FlexmonsterToolbar.prototype.toTrustedHtml("");
         for (var i = buttons.length - 1; i >= 0; i--) {
             var button = document.createElement("button");
             button.setAttribute("type", "button");
@@ -3589,7 +3599,7 @@ FlexmonsterToolbar.ColorPicker = function (toolbar, popupContainer) {
     colorBtn.setAttribute("type", "button");
     colorBtn.classList.add("fm-cts-item");
     colorBtn.classList.add("fm-current");
-    colorBtn.innerHTML = toolbar.Labels.cp_text;
+    colorBtn.innerHTML = FlexmonsterToolbar.prototype.toTrustedHtml(toolbar.Labels.cp_text);
     colorBtn.onclick = function () {
         onSwitchChange('font');
     };
@@ -3598,7 +3608,7 @@ FlexmonsterToolbar.ColorPicker = function (toolbar, popupContainer) {
     var bgColorBtn = document.createElement("button");
     bgColorBtn.setAttribute("type", "button");
     bgColorBtn.classList.add("fm-cts-item");
-    bgColorBtn.innerHTML = toolbar.Labels.cp_highlight;
+    bgColorBtn.innerHTML = FlexmonsterToolbar.prototype.toTrustedHtml(toolbar.Labels.cp_highlight);
     bgColorBtn.onclick = function () {
         onSwitchChange('bg');
     };
@@ -3680,14 +3690,14 @@ FlexmonsterToolbar.ColorPicker = function (toolbar, popupContainer) {
 
     var applyBtn = document.createElement("button");
     applyBtn.setAttribute("type", "button");
-    applyBtn.innerHTML = toolbar.Labels.apply;
+    applyBtn.innerHTML = FlexmonsterToolbar.prototype.toTrustedHtml(toolbar.Labels.apply);
     applyBtn.classList.add("fm-ui-btn");
     applyBtn.classList.add("fm-ui-btn-dark");
     applyBtn.addEventListener("click", onApplyClick);
 
     var cancelBtn = document.createElement("button");
     cancelBtn.setAttribute("type", "button");
-    cancelBtn.innerHTML = toolbar.Labels.cancel;
+    cancelBtn.innerHTML = FlexmonsterToolbar.prototype.toTrustedHtml(toolbar.Labels.cancel);
     cancelBtn.classList.add("fm-ui-btn");
     cancelBtn.addEventListener("click", onCancelClick);
 

package/types/flexmonster.d.ts

@@ -491,6 +491,7 @@ declare namespace Flexmonster {
         fontUrl?: string;
         alwaysEnclose?: boolean;
         pageFormat?: string;
+        serverContentType?: string;
     }
 
     interface Hierarchy {