Merge branch 'hotfix/v4.3.1'

Makefile

@@ -4,6 +4,12 @@ GRUNT_FLAGS = --no-color -v
 OUTPUT_DIR = deploy
 OUTPUT = $(OUTPUT_DIR)
 
+PRODUCT_VERSION ?= 0.0.0
+BUILD_NUMBER ?= 0
+
+GRUNT_ENV += PRODUCT_VERSION=$(PRODUCT_VERSION)
+GRUNT_ENV += BUILD_NUMBER=$(BUILD_NUMBER)
+
 WEBAPPS_DIR = web-apps
 WEBAPPS = $(OUTPUT)/$(WEBAPPS_DIR)
 NODE_MODULES = build/node_modules ../web-apps/build/node_modules
@@ -15,6 +21,8 @@ SDKJS_FILES += word/sdk-all.js
 SDKJS_FILES += cell/sdk-all.js
 SDKJS_FILES += slide/sdk-all.js
 
+.PHONY: all
+
 all: $(WEBAPPS)
 
 $(WEBAPPS): $(WEBAPPS_FILES)
@@ -23,7 +31,7 @@ $(WEBAPPS): $(WEBAPPS_FILES)
 
 $(WEBAPPS_FILES): $(NODE_MODULES) $(SDKJS_FILES)
 	cd ../$(WEBAPPS_DIR)/build  && \
-		$(GRUNT) deploy-$(filter %editor documents,$(subst /, ,$(@D)))-component $(GRUNT_FLAGS)
+		$(GRUNT_ENV) $(GRUNT) deploy-$(filter %editor documents,$(subst /, ,$(@D)))-component $(GRUNT_FLAGS)
 
 $(NODE_MODULES):
 	cd $(@D) && \
@@ -31,7 +39,7 @@ $(NODE_MODULES):
 
 $(SDKJS_FILES): $(NODE_MODULES)
 	cd build && \
-		$(GRUNT) build_$(@D) $(GRUNT_FLAGS)
+		$(GRUNT_ENV) $(GRUNT) build_$(@D) $(GRUNT_FLAGS)
 	
 clean:
 	rm -f $(WEBAPPS_FILES) $(SDKJS_FILES)

cell/model/clipboard.js

@@ -517,7 +517,10 @@
 				if(copyPasteUseBinary)
 				{
 					sBase64 = this.getBinaryForCopy(worksheet);
-					$(container.children[0]).addClass(sBase64);
+					if(container.children[0])
+					{
+						container.children[0].setAttribute("class", sBase64)
+					}
 				}
 				History.TurnOn();
 				

common/Charts/3DTransformation.js

@@ -1398,7 +1398,7 @@ Processor3D.prototype._calculateCameraDiffZX = function (newPoints)
 	
 	//TODO пока включаю для ВСЕГО checkOutSideArea(медленная функция), затем нужно переделать, используя закомментированный код сверху
 	this.cameraDiffZ = -minZ;
-	this.checkOutSideArea(newPoints);
+	this.checkOutSideArea2(newPoints);
 	
 };
 

common/Drawings/CommonController.js

@@ -2857,6 +2857,32 @@ DrawingObjectsController.prototype =
         }
         //Title Settings
         chart_space.setChart(chart_space.chart.createDuplicate());
+
+        /*if(AscFormat.isRealNumber(style_index) && style_index > 0 && style_index < 49 && chart_space.style !== style_index)
+        {
+            if(!b_clear_formatting)
+            {
+                chart_space.clearFormatting();
+            }
+            chart_space.setStyle(style_index);
+        }*/
+
+        var chart = chart_space.chart;
+        var plot_area = chart.plotArea;
+        var type = chartSettings.getType();
+        if(AscFormat.isRealNumber(style_index)){
+            --style_index;
+            var oCurChartSettings = this.getPropsFromChart(chartSpace);
+            var _cur_type = oCurChartSettings.type;
+            if(AscCommon.g_oChartPresets[_cur_type] && AscCommon.g_oChartPresets[_cur_type][style_index]){
+
+                plot_area.removeCharts(1, plot_area.charts.length - 1);
+                AscFormat.ApplyPresetToChartSpace(chartSpace, AscCommon.g_oChartPresets[_cur_type][style_index], chartSettings.bCreate);
+                return;
+            }
+        }
+
+
         chart_space.setStyle(chart_space.style);
         if(this.drawingObjects && this.drawingObjects.getWorksheet && typeof sRange === "string" && sRange.length > 0)
         {
@@ -2883,17 +2909,17 @@ DrawingObjectsController.prototype =
                 if(!(chart_space.bbox && chart_space.bbox.seriesBBox && b_equal_ws
                     && b_equal_bbox && b_equal_vert ) && !bLimit)
                 {
-					var catHeadersBBox, serHeadersBBox;
+                    var catHeadersBBox, serHeadersBBox;
                     if(chart_space.bbox && b_equal_bbox && b_equal_ws && !b_equal_vert)
                     {
                         if(chart_space.bbox.catBBox)
                             serHeadersBBox = {r1: chart_space.bbox.catBBox.r1, r2: chart_space.bbox.catBBox.r2,
-								c1: chart_space.bbox.catBBox.c1, c2: chart_space.bbox.catBBox.c2};
+                                c1: chart_space.bbox.catBBox.c1, c2: chart_space.bbox.catBBox.c2};
                         if(chart_space.bbox.serBBox)
                             catHeadersBBox = {r1: chart_space.bbox.serBBox.r1, r2: chart_space.bbox.serBBox.r2,
-								c1: chart_space.bbox.serBBox.c1, c2: chart_space.bbox.serBBox.c2};
+                                c1: chart_space.bbox.serBBox.c1, c2: chart_space.bbox.serBBox.c2};
                     }
-					var chartSeries = AscFormat.getChartSeries(ws_view.model, chartSettings, catHeadersBBox, serHeadersBBox);
+                    var chartSeries = AscFormat.getChartSeries(ws_view.model, chartSettings, catHeadersBBox, serHeadersBBox);
                     //chart_space.clearFormatting(true);
                     b_clear_formatting = true;
                     chart_space.rebuildSeriesFromAsc(chartSeries);
@@ -2901,25 +2927,7 @@ DrawingObjectsController.prototype =
             }
         }
 
-        /*if(AscFormat.isRealNumber(style_index) && style_index > 0 && style_index < 49 && chart_space.style !== style_index)
-        {
-            if(!b_clear_formatting)
-            {
-                chart_space.clearFormatting();
-            }
-            chart_space.setStyle(style_index);
-        }*/
-        var type = chartSettings.getType();
-        if(AscFormat.isRealNumber(style_index)){
-            --style_index;
-            var oCurChartSettings = this.getPropsFromChart(chartSpace);
-            var _cur_type = oCurChartSettings.type;
-            if(AscCommon.g_oChartPresets[_cur_type] && AscCommon.g_oChartPresets[_cur_type][style_index]){
-                AscFormat.ApplyPresetToChartSpace(chartSpace, AscCommon.g_oChartPresets[_cur_type][style_index], chartSettings.bCreate);
-                return;
-            }
-        }
-        var chart = chart_space.chart;
+
         var title_show_settings = chartSettings.getTitle();
         if(title_show_settings === c_oAscChartTitleShowSettings.none)
         {
@@ -2940,7 +2948,6 @@ DrawingObjectsController.prototype =
                 chart.title.setOverlay(title_show_settings === c_oAscChartTitleShowSettings.overlay);
             }
         }
-        var plot_area = chart.plotArea;
         //horAxisLabel
 
 

common/spellCheckLanguagesAll.js

@@ -185,7 +185,7 @@ g_spellCheckLanguages.push(new AscCommon.asc_CLanguage("sv-SE", 0x041d));
 //{ "th-TH", 0x041e },
 g_spellCheckLanguages.push(new AscCommon.asc_CLanguage("tr-TR", 0x041f));
 //{ "ur-PK", 0x0420 },
-//{ "id-ID", 0x0421 },
+g_spellCheckLanguages.push(new AscCommon.asc_CLanguage("id-ID", 0x0421));
 g_spellCheckLanguages.push(new AscCommon.asc_CLanguage("uk-UA", 0x0422));
 //{ "be-BY", 0x0423 },
 g_spellCheckLanguages.push(new AscCommon.asc_CLanguage("sl-SI", 0x0424));