flexmonster 2.9.29 → 2.9.32

package/toolbar/flexmonster.toolbar.js

@@ -1,6 +1,6 @@
 /** 
  * Flexmonster Pivot Table & Charts [https://www.flexmonster.com/]
- * July 2022 (v. 2.9.29)
+ * August 2022 (v. 2.9.32)
  * Copyright (c) 2022 Flexmonster. All rights reserved.
  *
  * Flexmonster Pivot Table & Charts commercial licenses may be obtained at
@@ -26,45 +26,45 @@ FlexmonsterToolbar.prototype.getTabs = function () {
         icon: this.icons.connect,
         kibana: false,
         menu: [{
-                title: Labels.connect_local_csv,
-                id: "fm-tab-connect-local-csv",
-                handler: this.connectLocalCSVHandler,
-                mobile: false,
-                icon: this.icons.connect_csv
-            },
-            {
-                title: Labels.connect_local_json,
-                id: "fm-tab-connect-local-json",
-                handler: this.connectLocalJSONHandler,
-                mobile: false,
-                icon: this.icons.connect_json
-            },
-            {
-                title: this.osUtils.isMobile ? Labels.connect_remote_csv_mobile : Labels.connect_remote_csv,
-                id: "fm-tab-connect-remote-csv",
-                handler: this.connectRemoteCSV,
-                icon: this.icons.connect_csv_remote
-            },
-            {
-                title: this.osUtils.isMobile ? Labels.connect_remote_json_mobile : Labels.connect_remote_json,
-                id: "fm-tab-connect-remote-json",
-                handler: this.connectRemoteJSON,
-                icon: this.icons.connect_json_remote
-            },
-            {
-                title: this.osUtils.isMobile ? Labels.connect_olap_mobile : Labels.connect_olap,
-                id: "fm-tab-connect-olap",
-                handler: this.connectOLAP,
-                flat: false,
-                icon: this.icons.connect_olap
-            },
-            {
-                title: this.osUtils.isMobile ? Labels.connect_elastic_mobile : Labels.connect_elastic,
-                id: "fm-tab-connect-elastic",
-                handler: this.connectElastic,
-                flat: false,
-                icon: this.icons.connect_elastic
-            }
+            title: Labels.connect_local_csv,
+            id: "fm-tab-connect-local-csv",
+            handler: this.connectLocalCSVHandler,
+            mobile: false,
+            icon: this.icons.connect_csv
+        },
+        {
+            title: Labels.connect_local_json,
+            id: "fm-tab-connect-local-json",
+            handler: this.connectLocalJSONHandler,
+            mobile: false,
+            icon: this.icons.connect_json
+        },
+        {
+            title: this.osUtils.isMobile ? Labels.connect_remote_csv_mobile : Labels.connect_remote_csv,
+            id: "fm-tab-connect-remote-csv",
+            handler: this.connectRemoteCSV,
+            icon: this.icons.connect_csv_remote
+        },
+        {
+            title: this.osUtils.isMobile ? Labels.connect_remote_json_mobile : Labels.connect_remote_json,
+            id: "fm-tab-connect-remote-json",
+            handler: this.connectRemoteJSON,
+            icon: this.icons.connect_json_remote
+        },
+        {
+            title: this.osUtils.isMobile ? Labels.connect_olap_mobile : Labels.connect_olap,
+            id: "fm-tab-connect-olap",
+            handler: this.connectOLAP,
+            flat: false,
+            icon: this.icons.connect_olap
+        },
+        {
+            title: this.osUtils.isMobile ? Labels.connect_elastic_mobile : Labels.connect_elastic,
+            id: "fm-tab-connect-elastic",
+            handler: this.connectElastic,
+            flat: false,
+            icon: this.icons.connect_elastic
+        }
         ]
     });
 
@@ -75,18 +75,18 @@ FlexmonsterToolbar.prototype.getTabs = function () {
         icon: this.icons.open,
         kibana: false,
         menu: [{
-                title: Labels.local_report,
-                id: "fm-tab-open-local-report",
-                handler: this.openLocalReport,
-                mobile: false,
-                icon: this.icons.open_local
-            },
-            {
-                title: this.osUtils.isMobile ? Labels.remote_report_mobile : Labels.remote_report,
-                id: "fm-tab-open-remote-report",
-                handler: this.openRemoteReport,
-                icon: this.icons.open_remote
-            }
+            title: Labels.local_report,
+            id: "fm-tab-open-local-report",
+            handler: this.openLocalReport,
+            mobile: false,
+            icon: this.icons.open_local
+        },
+        {
+            title: this.osUtils.isMobile ? Labels.remote_report_mobile : Labels.remote_report,
+            id: "fm-tab-open-remote-report",
+            handler: this.openRemoteReport,
+            icon: this.icons.open_remote
+        }
         ]
     });
 
@@ -107,46 +107,46 @@ FlexmonsterToolbar.prototype.getTabs = function () {
         mobile: false,
         icon: this.icons.export,
         menu: [{
-                title: Labels.export_print,
-                id: "fm-tab-export-print",
-                handler: this.printHandler,
-                icon: this.icons.export_print
-            },
-            {
-                title: Labels.export_html,
-                id: "fm-tab-export-html",
-                handler: this.exportHandler,
-                args: "html",
-                icon: this.icons.export_html
-            },
-            {
-                title: Labels.export_csv,
-                id: "fm-tab-export-csv",
-                handler: this.exportHandler,
-                args: "csv",
-                icon: this.icons.export_csv
-            },
-            {
-                title: Labels.export_excel,
-                id: "fm-tab-export-excel",
-                handler: this.exportHandler,
-                args: "excel",
-                icon: this.icons.export_excel
-            },
-            {
-                title: Labels.export_image,
-                id: "fm-tab-export-image",
-                handler: this.exportHandler,
-                args: "image",
-                icon: this.icons.export_image
-            },
-            {
-                title: Labels.export_pdf,
-                id: "fm-tab-export-pdf",
-                handler: this.exportHandler,
-                args: "pdf",
-                icon: this.icons.export_pdf
-            },
+            title: Labels.export_print,
+            id: "fm-tab-export-print",
+            handler: this.printHandler,
+            icon: this.icons.export_print
+        },
+        {
+            title: Labels.export_html,
+            id: "fm-tab-export-html",
+            handler: this.exportHandler,
+            args: "html",
+            icon: this.icons.export_html
+        },
+        {
+            title: Labels.export_csv,
+            id: "fm-tab-export-csv",
+            handler: this.exportHandler,
+            args: "csv",
+            icon: this.icons.export_csv
+        },
+        {
+            title: Labels.export_excel,
+            id: "fm-tab-export-excel",
+            handler: this.exportHandler,
+            args: "excel",
+            icon: this.icons.export_excel
+        },
+        {
+            title: Labels.export_image,
+            id: "fm-tab-export-image",
+            handler: this.exportHandler,
+            args: "image",
+            icon: this.icons.export_image
+        },
+        {
+            title: Labels.export_pdf,
+            id: "fm-tab-export-pdf",
+            handler: this.exportHandler,
+            args: "pdf",
+            icon: this.icons.export_pdf
+        },
         ]
     });
     // Share tab
@@ -177,63 +177,63 @@ FlexmonsterToolbar.prototype.getTabs = function () {
         onShowHandler: this.checkChartMultipleMeasures,
         icon: this.icons.charts,
         menu: [{
-                title: Labels.charts_column,
-                id: "fm-tab-charts-column",
-                handler: this.chartsHandler,
-                args: "column",
-                icon: this.icons.charts
-            },
-            {
-                title: Labels.charts_bar_horizontal,
-                id: "fm-tab-charts-bar-horizontal",
-                handler: this.chartsHandler,
-                args: "bar_h",
-                icon: this.icons.charts_bar
-            },
-            {
-                title: Labels.charts_line,
-                id: "fm-tab-charts-line",
-                handler: this.chartsHandler,
-                args: "line",
-                icon: this.icons.charts_line
-            },
-            {
-                title: Labels.charts_scatter,
-                id: "fm-tab-charts-scatter",
-                handler: this.chartsHandler,
-                args: "scatter",
-                icon: this.icons.charts_scatter
-            },
-            {
-                title: Labels.charts_pie,
-                id: "fm-tab-charts-pie",
-                handler: this.chartsHandler,
-                args: "pie",
-                icon: this.icons.charts_pie
-            },
-            {
-                title: Labels.charts_stacked_column,
-                id: "fm-tab-charts-stacked-column",
-                handler: this.chartsHandler,
-                args: "stacked_column",
-                flat: false,
-                icon: this.icons.charts_stacked_column
-            },
-            {
-                title: Labels.charts_column_line,
-                id: "fm-tab-charts-column-line",
-                handler: this.chartsHandler,
-                args: "column_line",
-                icon: this.icons.charts_column_line
-            },
-            {
-                title: Labels.charts_multiple,
-                id: "fm-tab-charts-multiple",
-                handler: this.chartsMultipleHandler,
-                flat: false,
-                mobile: false,
-                type: "checkbox"
-            }
+            title: Labels.charts_column,
+            id: "fm-tab-charts-column",
+            handler: this.chartsHandler,
+            args: "column",
+            icon: this.icons.charts
+        },
+        {
+            title: Labels.charts_bar_horizontal,
+            id: "fm-tab-charts-bar-horizontal",
+            handler: this.chartsHandler,
+            args: "bar_h",
+            icon: this.icons.charts_bar
+        },
+        {
+            title: Labels.charts_line,
+            id: "fm-tab-charts-line",
+            handler: this.chartsHandler,
+            args: "line",
+            icon: this.icons.charts_line
+        },
+        {
+            title: Labels.charts_scatter,
+            id: "fm-tab-charts-scatter",
+            handler: this.chartsHandler,
+            args: "scatter",
+            icon: this.icons.charts_scatter
+        },
+        {
+            title: Labels.charts_pie,
+            id: "fm-tab-charts-pie",
+            handler: this.chartsHandler,
+            args: "pie",
+            icon: this.icons.charts_pie
+        },
+        {
+            title: Labels.charts_stacked_column,
+            id: "fm-tab-charts-stacked-column",
+            handler: this.chartsHandler,
+            args: "stacked_column",
+            flat: false,
+            icon: this.icons.charts_stacked_column
+        },
+        {
+            title: Labels.charts_column_line,
+            id: "fm-tab-charts-column-line",
+            handler: this.chartsHandler,
+            args: "column_line",
+            icon: this.icons.charts_column_line
+        },
+        {
+            title: Labels.charts_multiple,
+            id: "fm-tab-charts-multiple",
+            handler: this.chartsMultipleHandler,
+            flat: false,
+            mobile: false,
+            type: "checkbox"
+        }
         ]
     });
     tabs.push({
@@ -247,17 +247,17 @@ FlexmonsterToolbar.prototype.getTabs = function () {
         icon: this.icons.format,
         rightGroup: true,
         menu: [{
-                title: this.osUtils.isMobile ? Labels.format_cells_mobile : Labels.format_cells,
-                id: "fm-tab-format-cells",
-                handler: this.formatCellsHandler,
-                icon: this.icons.format_number
-            },
-            {
-                title: this.osUtils.isMobile ? Labels.conditional_formatting_mobile : Labels.conditional_formatting,
-                id: "fm-tab-format-conditional",
-                handler: this.conditionalFormattingHandler,
-                icon: this.icons.format_conditional
-            }
+            title: this.osUtils.isMobile ? Labels.format_cells_mobile : Labels.format_cells,
+            id: "fm-tab-format-cells",
+            handler: this.formatCellsHandler,
+            icon: this.icons.format_number
+        },
+        {
+            title: this.osUtils.isMobile ? Labels.conditional_formatting_mobile : Labels.conditional_formatting,
+            id: "fm-tab-format-conditional",
+            handler: this.conditionalFormattingHandler,
+            icon: this.icons.format_conditional
+        }
         ]
     });
 
@@ -429,8 +429,8 @@ FlexmonsterToolbar.prototype.init = function () {
             for (var i = 0; i < children.length; i++) {
                 var classList = children[i].classList;
                 if (!(classList.contains("fm-popup") ||
-                        classList.contains("fm-modal-overlay") ||
-                        classList.contains("fm-popup-modal-overlay"))) {
+                    classList.contains("fm-modal-overlay") ||
+                    classList.contains("fm-popup-modal-overlay"))) {
                     elementsToDelete.push(children[i]);
                 }
             }
@@ -441,7 +441,8 @@ FlexmonsterToolbar.prototype.init = function () {
     }
 
     var enableToolbarScrolling = function () { //enables scrolling if possible
-        if (_this.toolbar.scrollWidth - _this.toolbar.clientWidth > 0) {
+        var singleArrowWidth = 20;
+        if (_this.toolbar.scrollWidth - _this.toolbar.clientWidth > singleArrowWidth) {
             _this.leftScrollButton = document.createElement("div");
             _this.leftScrollButton.classList.add("fm-left-scroll-button");
             _this.rightScrollButton = document.createElement("div");
@@ -509,21 +510,17 @@ FlexmonsterToolbar.prototype.init = function () {
         }
     }
 
-
     _this._redrawToolbar = function () {
         clear();
-
         createToolbar();
-
         enableToolbarScrolling();
-
         if (_this.isFullscreen()) {
-            document.querySelector("#fm-tab-fullscreen > a > div").innerHTML = _this.icons.minimize;
+            _this.pivotContainer.querySelector("#fm-tab-fullscreen > a > div").innerHTML = _this.icons.minimize;
+            _this.setText(_this.pivotContainer.querySelector("#fm-tab-fullscreen .fm-tab-label"), _this.Labels.minimize);
         }
     }
-
+    
     _this._redrawToolbar();
-
     window.addEventListener("resize", _this._redrawToolbar);
 }
 
@@ -774,7 +771,7 @@ FlexmonsterToolbar.prototype.printHandler = function () {
     this.pivot.print();
 }
 FlexmonsterToolbar.prototype.exportHandler = function (type) {
-    (type == "pdf") ? this.showExportPdfDialog(): this.pivot.exportTo(type);
+    (type == "pdf") ? this.showExportPdfDialog() : this.pivot.exportTo(type);
 }
 // Share tab
 FlexmonsterToolbar.prototype.shareReportHandler = function () {
@@ -803,15 +800,15 @@ FlexmonsterToolbar.prototype.showConnectToRemoteCSVDialog = function () {
     dialog.content.classList.add("fm-popup-w500");
     dialog.setTitle(Labels.open_remote_csv);
     dialog.setToolbar([{
-            id: "fm-btn-open",
-            label: Labels.open,
-            handler: applyHandler,
-            isPositive: true
-        },
-        {
-            id: "fm-btn-cancel",
-            label: Labels.cancel
-        }
+        id: "fm-btn-open",
+        label: Labels.open,
+        handler: applyHandler,
+        isPositive: true
+    },
+    {
+        id: "fm-btn-cancel",
+        label: Labels.cancel
+    }
     ]);
 
     var content = document.createElement("div");
@@ -842,15 +839,15 @@ FlexmonsterToolbar.prototype.showConnectToRemoteJsonDialog = function () {
     dialog.content.classList.add("fm-popup-w500");
     dialog.setTitle(Labels.open_remote_json);
     dialog.setToolbar([{
-            id: "fm-btn-open",
-            label: Labels.open,
-            handler: applyHandler,
-            isPositive: true
-        },
-        {
-            id: "fm-btn-cancel",
-            label: Labels.cancel
-        }
+        id: "fm-btn-open",
+        label: Labels.open,
+        handler: applyHandler,
+        isPositive: true
+    },
+    {
+        id: "fm-btn-cancel",
+        label: Labels.cancel
+    }
     ]);
 
     var content = document.createElement("div");
@@ -903,16 +900,16 @@ FlexmonsterToolbar.prototype.showConnectToElasticDialog = function () {
     dialog.content.classList.add("fm-popup-w570");
     dialog.setTitle(Labels.connect_elastic_title);
     dialog.setToolbar([{
-            id: "fm-btn-open",
-            label: Labels.ok,
-            handler: okHandler,
-            disabled: true,
-            isPositive: true
-        },
-        {
-            id: "fm-btn-cancel",
-            label: Labels.cancel
-        }
+        id: "fm-btn-open",
+        label: Labels.ok,
+        handler: okHandler,
+        disabled: true,
+        isPositive: true
+    },
+    {
+        id: "fm-btn-cancel",
+        label: Labels.cancel
+    }
     ]);
 
     var content = document.createElement("div");
@@ -1025,16 +1022,16 @@ FlexmonsterToolbar.prototype.showConnectToOLAPDialog = function () {
     dialog.content.classList.add("fm-popup-w570");
     dialog.setTitle(this.osUtils.isMobile ? Labels.connect_olap_mobile : Labels.olap_connection_tool);
     dialog.setToolbar([{
-            id: "fm-btn-open",
-            label: Labels.ok,
-            handler: okHandler,
-            disabled: true,
-            isPositive: true
-        },
-        {
-            id: "fm-btn-cancel",
-            label: Labels.cancel
-        }
+        id: "fm-btn-open",
+        label: Labels.ok,
+        handler: okHandler,
+        disabled: true,
+        isPositive: true
+    },
+    {
+        id: "fm-btn-cancel",
+        label: Labels.cancel
+    }
     ]);
 
     var content = document.createElement("div");
@@ -1133,15 +1130,15 @@ FlexmonsterToolbar.prototype.showOpenRemoteReportDialog = function () {
     dialog.content.classList.add("fm-popup-w500");
     dialog.setTitle(Labels.open_remote_report);
     dialog.setToolbar([{
-            id: "fm-btn-open",
-            label: Labels.open,
-            handler: applyHandler,
-            isPositive: true
-        },
-        {
-            id: "fm-btn-cancel",
-            label: Labels.cancel
-        }
+        id: "fm-btn-open",
+        label: Labels.open,
+        handler: applyHandler,
+        isPositive: true
+    },
+    {
+        id: "fm-btn-cancel",
+        label: Labels.cancel
+    }
     ]);
     var content = document.createElement("div");
     var textInput = document.createElement("input");
@@ -1159,163 +1156,163 @@ FlexmonsterToolbar.prototype.showOpenRemoteReportDialog = function () {
 // Format cells
 FlexmonsterToolbar.prototype.defaults.numberFormatting = {
     textAligns: [{
-            label: "align_left",
-            value: "left"
-        },
-        {
-            label: "align_right",
-            value: "right"
-        },
-        {
-            label: "align_center",
-            value: "center"
-        },
+        label: "align_left",
+        value: "left"
+    },
+    {
+        label: "align_right",
+        value: "right"
+    },
+    {
+        label: "align_center",
+        value: "center"
+    },
     ],
     thousandsSeparators: [{
-            label: "none",
-            value: ""
-        },
-        {
-            label: "space",
-            value: " "
-        },
-        {
-            label: ",",
-            value: ","
-        },
-        {
-            label: ".",
-            value: "."
-        },
+        label: "none",
+        value: ""
+    },
+    {
+        label: "space",
+        value: " "
+    },
+    {
+        label: ",",
+        value: ","
+    },
+    {
+        label: ".",
+        value: "."
+    },
     ],
     decimalSeparators: [{
-            label: ",",
-            value: ","
-        },
-        {
-            label: ".",
-            value: "."
-        },
+        label: ",",
+        value: ","
+    },
+    {
+        label: ".",
+        value: "."
+    },
     ],
     decimalPlaces: [{
-            label: "none",
-            value: -1
-        },
-        {
-            label: "0",
-            value: 0
-        },
-        {
-            label: "1",
-            value: 1
-        },
-        {
-            label: "2",
-            value: 2
-        },
-        {
-            label: "3",
-            value: 3
-        },
-        {
-            label: "4",
-            value: 4
-        },
-        {
-            label: "5",
-            value: 5
-        },
-        {
-            label: "6",
-            value: 6
-        },
-        {
-            label: "7",
-            value: 7
-        },
-        {
-            label: "8",
-            value: 8
-        },
-        {
-            label: "9",
-            value: 9
-        },
+        label: "none",
+        value: -1
+    },
+    {
+        label: "0",
+        value: 0
+    },
+    {
+        label: "1",
+        value: 1
+    },
+    {
+        label: "2",
+        value: 2
+    },
+    {
+        label: "3",
+        value: 3
+    },
+    {
+        label: "4",
+        value: 4
+    },
+    {
+        label: "5",
+        value: 5
+    },
+    {
+        label: "6",
+        value: 6
+    },
+    {
+        label: "7",
+        value: 7
+    },
+    {
+        label: "8",
+        value: 8
+    },
+    {
+        label: "9",
+        value: 9
+    },
     ],
     positiveCurrencyFormats: [{
-            label: "$1",
-            value: "$1"
-        },
-        {
-            label: "1$",
-            value: "1$"
-        },
+        label: "$1",
+        value: "$1"
+    },
+    {
+        label: "1$",
+        value: "1$"
+    },
     ],
     negativeCurrencyFormats: [{
-            label: "-$1",
-            value: "-$1"
-        },
-        {
-            label: "-1$",
-            value: "-1$"
-        },
-        {
-            label: "$-1",
-            value: "$-1"
-        },
-        {
-            label: "$1-",
-            value: "$1-"
-        },
-        {
-            label: "1-$",
-            value: "1-$"
-        },
-        {
-            label: "1$-",
-            value: "1$-"
-        },
-        {
-            label: "($1)",
-            value: "($1)"
-        },
-        {
-            label: "(1$)",
-            value: "(1$)"
-        },
+        label: "-$1",
+        value: "-$1"
+    },
+    {
+        label: "-1$",
+        value: "-1$"
+    },
+    {
+        label: "$-1",
+        value: "$-1"
+    },
+    {
+        label: "$1-",
+        value: "$1-"
+    },
+    {
+        label: "1-$",
+        value: "1-$"
+    },
+    {
+        label: "1$-",
+        value: "1$-"
+    },
+    {
+        label: "($1)",
+        value: "($1)"
+    },
+    {
+        label: "(1$)",
+        value: "(1$)"
+    },
     ],
     negativeNumberFormats: [{
-            label: "-1",
-            value: "-1"
-        },
-        {
-            label: "- 1",
-            value: "- 1"
-        },
-        {
-            label: "1-",
-            value: "1-"
-        },
-        {
-            label: "1 -",
-            value: "1 -"
-        },
-        {
-            label: "(1)",
-            value: "(1)"
-        },
+        label: "-1",
+        value: "-1"
+    },
+    {
+        label: "- 1",
+        value: "- 1"
+    },
+    {
+        label: "1-",
+        value: "1-"
+    },
+    {
+        label: "1 -",
+        value: "1 -"
+    },
+    {
+        label: "(1)",
+        value: "(1)"
+    },
     ],
     isPercent: [{
-            label: "true_value",
-            value: true
-        },
-        {
-            label: "false_value",
-            value: false
-        },
+        label: "true_value",
+        value: true
+    },
+    {
+        label: "false_value",
+        value: false
+    },
     ]
 }
-FlexmonsterToolbar.prototype.ConfirmationPopUp = function () {}
+FlexmonsterToolbar.prototype.ConfirmationPopUp = function () { }
 FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, measureAggregation) {
     var self = this;
     var Labels = this.Labels;
@@ -1411,16 +1408,16 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
     ConfirmationPopUp.prototype.initializePopUp = function () {
         this.dialog.setTitle(Labels.confirm_title);
         confirmPopUp.dialog.setToolbar([{
-                id: "fm-btn-apply",
-                label: Labels.ok,
-                handler: switchToMeasure,
-                isPositive: true
-            },
-            {
-                id: "fm-btn-cancel",
-                label: Labels.cancel,
-                handler: restoreEditedMeasure
-            }
+            id: "fm-btn-apply",
+            label: Labels.ok,
+            handler: switchToMeasure,
+            isPositive: true
+        },
+        {
+            id: "fm-btn-cancel",
+            label: Labels.cancel,
+            handler: restoreEditedMeasure
+        }
         ], false, this.removePopUp);
         var content = document.createElement("div");
         var contentLabel = document.createElement("label");
@@ -1462,8 +1459,8 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         var formatObject = {};
         formatObject = filterFormatting(formatObject);
         if ((formatObject.hasOwnProperty("textAlign") || formatObject.hasOwnProperty("thousandsSeparator") || formatObject.hasOwnProperty("decimalSeparator") ||
-                formatObject.hasOwnProperty("decimalPlaces") || formatObject.hasOwnProperty("currencySymbol") || formatObject.hasOwnProperty("positiveCurrencyFormat") ||
-                formatObject.hasOwnProperty("negativeCurrencyFormat") || formatObject.hasOwnProperty("nullValue") || formatObject.hasOwnProperty("isPercent")) &&
+            formatObject.hasOwnProperty("decimalPlaces") || formatObject.hasOwnProperty("currencySymbol") || formatObject.hasOwnProperty("positiveCurrencyFormat") ||
+            formatObject.hasOwnProperty("negativeCurrencyFormat") || formatObject.hasOwnProperty("nullValue") || formatObject.hasOwnProperty("isPercent")) &&
             (currentMeasureNames && currentMeasureNames.length > 0)) {
             confirmPopUp.createPopUp();
             confirmPopUp.initializePopUp();
@@ -1575,8 +1572,8 @@ 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, 
-                (measure[0] == "" ? null : measure[0]), 
+            self.pivot.setFormat(formatVO,
+                (measure[0] == "" ? null : measure[0]),
                 (self.singleAggregationFormatting ? undefined : measure[1]));
         }
         // if (valuesDropDown.getValue() === "" && currentReport.hasOwnProperty("formats")) {
@@ -1617,15 +1614,15 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
     dialog.content.classList.add("fm-popup-format-cells");
     dialog.setTitle(this.osUtils.isMobile ? Labels.format : Labels.format_cells);
     dialog.setToolbar([{
-            id: "fm-btn-apply",
-            label: Labels.apply,
-            handler: applyHandler,
-            isPositive: true
-        },
-        {
-            id: "fm-btn-cancel",
-            label: Labels.cancel
-        }
+        id: "fm-btn-apply",
+        label: Labels.apply,
+        handler: applyHandler,
+        isPositive: true
+    },
+    {
+        id: "fm-btn-cancel",
+        label: Labels.cancel
+    }
     ], true);
 
     var content = document.createElement("div");
@@ -1904,15 +1901,15 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
     dialog.content.classList.add("fm-popup-conditional");
     dialog.setTitle(this.osUtils.isMobile ? Labels.conditional : Labels.conditional_formatting);
     dialog.setToolbar([{
-            id: "fm-btn-apply",
-            label: Labels.apply,
-            handler: applyHandler,
-            isPositive: true
-        },
-        {
-            id: "fm-btn-cancel",
-            label: Labels.cancel
-        }
+        id: "fm-btn-apply",
+        label: Labels.apply,
+        handler: applyHandler,
+        isPositive: true
+    },
+    {
+        id: "fm-btn-cancel",
+        label: Labels.cancel
+    }
     ], true);
 
     var addConditionBtn = document.createElement("button");
@@ -1980,37 +1977,37 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
 FlexmonsterToolbar.prototype.defaults.fontSizes = ["8px", "9px", "10px", "11px", "12px", "13px", "14px"];
 FlexmonsterToolbar.prototype.defaults.fonts = ['Arial', 'Lucida Sans Unicode', 'Verdana', 'Courier New', 'Palatino Linotype', 'Tahoma', 'Impact', 'Trebuchet MS', 'Georgia', 'Times New Roman'];
 FlexmonsterToolbar.prototype.defaults.conditions = [{
-        label: "less_than",
-        value: '<'
-    },
-    {
-        label: "less_than_or_equal",
-        value: '<='
-    },
-    {
-        label: "greater_than",
-        value: '>'
-    },
-    {
-        label: "greater_than_or_equal",
-        value: '>='
-    },
-    {
-        label: "equal_to",
-        value: '='
-    },
-    {
-        label: "not_equal_to",
-        value: '!='
-    },
-    {
-        label: "between",
-        value: '><'
-    },
-    {
-        label: "is_empty",
-        value: 'isNaN'
-    }
+    label: "less_than",
+    value: '<'
+},
+{
+    label: "less_than_or_equal",
+    value: '<='
+},
+{
+    label: "greater_than",
+    value: '>'
+},
+{
+    label: "greater_than_or_equal",
+    value: '>='
+},
+{
+    label: "equal_to",
+    value: '='
+},
+{
+    label: "not_equal_to",
+    value: '!='
+},
+{
+    label: "between",
+    value: '><'
+},
+{
+    label: "is_empty",
+    value: 'isNaN'
+}
 ];
 FlexmonsterToolbar.prototype.createConditionalFormattingItem = function (data, allConditions, isMSAS) {
     var self = this;
@@ -2020,7 +2017,7 @@ FlexmonsterToolbar.prototype.createConditionalFormattingItem = function (data, a
     var MEASURE_UNIQUENAME_DELIMETER = "_@@_@@_@@_";
     //generates uniqueName based on measure's uniqueName and aggregation
     var getMeasureUniqueName = function (uniqueName, aggregation) {
-        return _isMSAS || aggregation === "none" || aggregation === ""  ? uniqueName : uniqueName + MEASURE_UNIQUENAME_DELIMETER + aggregation;
+        return _isMSAS || aggregation === "none" || aggregation === "" ? uniqueName : uniqueName + MEASURE_UNIQUENAME_DELIMETER + aggregation;
     }
     //generates measure tuple (uniqueName and aggregation) based on getMeasureUniqueName result
     var getMeasureFromUniqueName = function (uniqueName) {
@@ -2048,7 +2045,7 @@ FlexmonsterToolbar.prototype.createConditionalFormattingItem = function (data, a
             value: ""
         }];
         if (selectedMeasure && selectedMeasureAggregation === "" && (currentMeasure && !currentMeasure.calculated) && !isMSAS) {
-            var measureItemList = measures.filter(function(item) {
+            var measureItemList = measures.filter(function (item) {
                 return item.uniqueName === selectedMeasure;
             });
             var selectedMeasureLabel = measureItemList.length > 0 ? measureItemList[0].name + " (" + Labels.all + ")" : selectedMeasure + " (" + Labels.all + ")";
@@ -2071,8 +2068,8 @@ FlexmonsterToolbar.prototype.createConditionalFormattingItem = function (data, a
             }
         }
         valuesDropDown.setDataProvider(dataProvider);
-        valuesDropDown.setValue(selectedMeasure && selectedMeasureAggregation !== undefined 
-            ? getMeasureUniqueName(selectedMeasure, selectedMeasureAggregation) 
+        valuesDropDown.setValue(selectedMeasure && selectedMeasureAggregation !== undefined
+            ? getMeasureUniqueName(selectedMeasure, selectedMeasureAggregation)
             : (selectedMeasure ? selectedMeasure : dataProvider[0].value));
     };
 
@@ -2321,15 +2318,15 @@ FlexmonsterToolbar.prototype.showOptionsDialog = function () {
     dialog.content.classList.add("fm-popup-options");
     dialog.setTitle(this.osUtils.isMobile ? Labels.options : Labels.layout_options);
     dialog.setToolbar([{
-            id: "fm-btn-apply",
-            label: Labels.apply,
-            handler: applyHandler,
-            isPositive: true
-        },
-        {
-            id: "fm-btn-cancel",
-            label: Labels.cancel
-        }
+        id: "fm-btn-apply",
+        label: Labels.apply,
+        handler: applyHandler,
+        isPositive: true
+    },
+    {
+        id: "fm-btn-cancel",
+        label: Labels.cancel
+    }
     ], true);
 
     var content = document.createElement("div");
@@ -2445,15 +2442,15 @@ FlexmonsterToolbar.prototype.showExportPdfDialog = function () {
     var dialog = this.popupManager.createPopup();
     dialog.setTitle(Labels.choose_page_orientation);
     dialog.setToolbar([{
-            id: "fm-btn-apply",
-            label: Labels.apply,
-            handler: applyHandler,
-            isPositive: true
-        },
-        {
-            id: "fm-btn-cancel",
-            label: Labels.cancel
-        }
+        id: "fm-btn-apply",
+        label: Labels.apply,
+        handler: applyHandler,
+        isPositive: true
+    },
+    {
+        id: "fm-btn-cancel",
+        label: Labels.cancel
+    }
     ]);
 
     var content = document.createElement("div");
@@ -2485,39 +2482,21 @@ FlexmonsterToolbar.prototype.isFullscreen = function () {
 FlexmonsterToolbar.prototype.enterFullscreen = function (element) {
     if (element.requestFullscreen || element.webkitRequestFullScreen ||
         element.mozRequestFullScreen || (element.msRequestFullscreen && window == top)) {
-        this.containerStyle = {
-            width: this.container.style.width,
-            height: this.container.style.height,
-            position: this.container.style.position,
-            top: this.container.style.top,
-            bottom: this.container.style.bottom,
-            left: this.container.style.left,
-            right: this.container.style.right,
-            marginTop: this.container.style.marginTop,
-            marginLeft: this.container.style.marginLeft,
-            zIndex: this.container.style.zIndex
-        };
-        this.container.style.width = "100%";
-        this.container.style.height = "100%";
-        this.container.style.position = "fixed";
-        this.container.style.top = 0 + "px";
-        this.container.style.left = 0 + "px";
-        this.container.style.zIndex = 2147483647;
-
-        this.toolbarWrapper.style.width = "100%";
-        var fullScreenChangeHandler = null;
-
-        this._redrawToolbar();
-
+        var _this = this;
         if (element.requestFullscreen) {
-            element.requestFullscreen();
-            fullScreenChangeHandler = function () {
-                if (!this.isFullscreen()) {
-                    this.exitFullscreen();
-                    element.removeEventListener("fullscreenchange", fullScreenChangeHandler);
-                }
-            }.bind(this);
-            element.addEventListener("fullscreenchange", fullScreenChangeHandler, false);
+            element.requestFullscreen().then(function () {
+                var fullScreenChangeHandler = function () {
+                    if (!_this.isFullscreen()) {
+                        _this.exitFullscreen();
+                        element.removeEventListener("fullscreenchange", fullScreenChangeHandler);
+                    } else {
+                        _this.onFullscreenEntered();
+                    }
+                }.bind(_this);
+                element.addEventListener("fullscreenchange", fullScreenChangeHandler, false);
+            }).catch(function () {
+                _this.onFullscreenError();
+            });
         } else if (element.webkitRequestFullScreen) {
             var ua = navigator.userAgent;
             if ((ua.indexOf("Safari") > -1) && (ua.indexOf("Chrome") == -1)) {
@@ -2525,28 +2504,34 @@ FlexmonsterToolbar.prototype.enterFullscreen = function (element) {
             } else {
                 element.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
             }
-            fullScreenChangeHandler = function () {
+            var fullScreenChangeHandler = function () {
                 if (!this.isFullscreen()) {
                     this.exitFullscreen();
                     element.removeEventListener("webkitfullscreenchange", fullScreenChangeHandler);
+                } else {
+                    this.onFullscreenEntered();
                 }
             }.bind(this);
             element.addEventListener("webkitfullscreenchange", fullScreenChangeHandler, false);
         } else if (element.mozRequestFullScreen) {
             element.mozRequestFullScreen();
-            fullScreenChangeHandler = function () {
+            var fullScreenChangeHandler = function () {
                 if (!this.isFullscreen()) {
                     this.exitFullscreen();
                     document.removeEventListener("mozfullscreenchange", fullScreenChangeHandler);
+                } else {
+                    this.onFullscreenEntered();
                 }
             }.bind(this);
             document.addEventListener("mozfullscreenchange", fullScreenChangeHandler, false);
         } else if (element.msRequestFullscreen) { //IE 11
             element.msRequestFullscreen();
-            fullScreenChangeHandler = function () {
+            var fullScreenChangeHandler = function () {
                 if (!this.isFullscreen()) {
                     this.exitFullscreen();
                     document.removeEventListener("MSFullscreenChange", fullScreenChangeHandler);
+                } else {
+                    this.onFullscreenEntered();
                 }
             }.bind(this);
             document.addEventListener("MSFullscreenChange", fullScreenChangeHandler, false);
@@ -2555,6 +2540,36 @@ FlexmonsterToolbar.prototype.enterFullscreen = function (element) {
         alert("Fullscreen mode in IE11 is not supported when Pivot is embedded in IFrame.");
     }
 }
+FlexmonsterToolbar.prototype.onFullscreenEntered = function () {
+    this.containerStyle = {
+        width: this.container.style.width,
+        height: this.container.style.height,
+        position: this.container.style.position,
+        top: this.container.style.top,
+        bottom: this.container.style.bottom,
+        left: this.container.style.left,
+        right: this.container.style.right,
+        marginTop: this.container.style.marginTop,
+        marginLeft: this.container.style.marginLeft,
+        zIndex: this.container.style.zIndex
+    };
+    this.container.style.width = "100%";
+    this.container.style.height = "100%";
+    this.container.style.position = "fixed";
+    this.container.style.top = 0 + "px";
+    this.container.style.left = 0 + "px";
+    this.container.style.zIndex = 2147483647;
+
+    this.toolbarWrapper.style.width = "100%";
+
+    this._redrawToolbar();
+}
+FlexmonsterToolbar.prototype.onFullscreenError = function () {
+    this.pivot.alert({
+        title: this.Labels.fullscreenErrorTitle,
+        message: this.Labels.fullscreenErrorMessage,
+    });
+}
 FlexmonsterToolbar.prototype.exitFullscreen = function () {
     this.container.style.width = this.containerStyle.width;
     this.container.style.height = this.containerStyle.height;
@@ -2629,7 +2644,7 @@ FlexmonsterToolbar.prototype.makeSelectableByKeyboard = function (element) {
         if (document.activeElement !== element) {
             return;
         }
-        if (e.which == 13 /*enter*/ || e.which == 32 /*space*/ ) {
+        if (e.which == 13 /*enter*/ || e.which == 32 /*space*/) {
             element.click();
             var el = element.querySelector("input");
             if (el) {
@@ -3166,7 +3181,7 @@ FlexmonsterToolbar.prototype.createTabMenu = function (dataProvider, parentTab)
             setActiveItemAt(e.keyCode == 40 ? _activeItemIndex + 1 : _activeItemIndex - 1);
             e.preventDefault();
         }
-        if (e.keyCode == 13 /*enter*/ || e.keyCode == 32 /*space*/ ) {
+        if (e.keyCode == 13 /*enter*/ || e.keyCode == 32 /*space*/) {
             if (_isOpen) {
                 if (_activeItemIndex >= 0) {
                     var data = dataProvider[_activeItemIndex];
@@ -3181,7 +3196,7 @@ FlexmonsterToolbar.prototype.createTabMenu = function (dataProvider, parentTab)
                 e.preventDefault();
             }
         }
-        if (_isOpen && e.keyCode == 27 /*esc*/ ) {
+        if (_isOpen && e.keyCode == 27 /*esc*/) {
             hide();
             e.stopImmediatePropagation();
         }
@@ -3206,7 +3221,7 @@ FlexmonsterToolbar.prototype.createTabMenu = function (dataProvider, parentTab)
         var rightScrollArrow = _this.container.querySelector(".fm-right-scroll-button");
         var arrowWidth = (leftScrollArrow ? leftScrollArrow.offsetWidth : 0) + (rightScrollArrow ? rightScrollArrow.offsetWidth : 0);
 
-        if ((menuRect.left > parentRect.right - arrowWidth || menuRect.left < parentRect.left + arrowWidth) 
+        if ((menuRect.left > parentRect.right - arrowWidth || menuRect.left < parentRect.left + arrowWidth)
             && parentRect.right + menuRect.width < toolbarRect.right && _this.toolbar.scrollLeft > 0) {// this case handles left positioning with scroll           
             menuContainer.style.left = 0;
             menuRect = menuContainer.getBoundingClientRect();
@@ -3214,11 +3229,11 @@ FlexmonsterToolbar.prototype.createTabMenu = function (dataProvider, parentTab)
             var luft = Math.round(parentRect.right - menuRect.left - parentRect.width * 0.6);
             menuContainer.style.left = luft + "px";
             menuList.classList.add("fm-dropdown-scrollable-left");
-        } else if (menuRect.right > toolbarRect.right - arrowWidth 
+        } else if (menuRect.right > toolbarRect.right - arrowWidth
             && parentRect.left + parentRect.width / 2 - menuRect.width > 0) {//this case handles right positioning
             menuContainer.style.right = 0;
             menuRect = menuContainer.getBoundingClientRect();
-            
+
             var luft = Math.round(menuRect.right - parentRect.left - parentRect.width * 0.6);
             menuContainer.style.right = luft + "px";
             menuList.classList.add("fm-dropdown-scrollable-right");