Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

Makefile

@@ -6,7 +6,7 @@ OUTPUT = $(OUTPUT_DIR)
 
 WEBAPPS_DIR = web-apps
 WEBAPPS = $(OUTPUT)/$(WEBAPPS_DIR)
-GRUNT_FILES = build/deploy/Gruntfile.js.out ../web-apps/build/Gruntfile.js.out
+GRUNT_FILES = build/Gruntfile.js.out ../web-apps/build/Gruntfile.js.out
 
 all: $(WEBAPPS)
 
@@ -21,4 +21,4 @@ $(GRUNT_FILES):
 	echo "Done" > $@
 	
 clean:
-	rm -f $(GRUNT_FILES)
\ No newline at end of file
+	rm -f $(GRUNT_FILES)

build/Gruntfile.js

@@ -173,15 +173,15 @@ module.exports = function(grunt) {
 			});		
 			var mobileFiles = packageFile['compile']['sdk']['mobile'];
 			if(mobileFiles){
-				srcFiles = mobileFiles.concat(srcFiles);
+				srcFiles = srcFiles.concat(mobileFiles);
 			}
 		}
 		
 		if (grunt.option('private')) {
-			srcFiles.concat(packageFile['compile']['sdk']['private']);
+			srcFiles = srcFiles.concat(packageFile['compile']['sdk']['private']);
 		}
 		if (grunt.option('desktop')) {
-			srcFiles.concat(packageFile['compile']['sdk']['desktop']);
+			srcFiles = srcFiles.concat(packageFile['compile']['sdk']['desktop']);
 		}
 	
 		
@@ -216,7 +216,7 @@ module.exports = function(grunt) {
 						variables: {
 							Version: packageFile['info']['version'],
 							Build: packageFile['info']['build'].toString(),
-							Rev: packageFile['info']['rev'].toString()
+							Rev: (packageFile['info']['rev'] || 1).toString()
 						}
 					},
 					files: {

build/build-desktop.bat

+CD /D %~dp0
+call npm install -g grunt-cli
+call npm install
+call grunt --level=WHITESPACE_ONLY --nomap=true --private=true --desktop=true --formatting=PRETTY_PRINT
+rem call grunt --level=ADVANCED --nomap=true --private=true --desktop=true
+pause
\ No newline at end of file

build/build_slide_mobile.bat → build/build-mobile.bat

 CD /D %~dp0
 call npm install -g grunt-cli
 call npm install
-call grunt --level=WHITESPACE_ONLY --nomap=true --formatting=PRETTY_PRINT --mobile=true
+call grunt --level=WHITESPACE_ONLY --nomap=true --private=true --mobile=true --formatting=PRETTY_PRINT
 pause
\ No newline at end of file

build/build.bat

-@echo off
-cd /D %~dp0
-
-@echo on
-call grunt --no-color
\ No newline at end of file

build/configs/webexcel.json

@@ -201,7 +201,6 @@
     },
     "tasks": {
         "build": [
-            "increment_build",
             "compile_sdk"
         ]
     }

build/configs/webpowerpoint.json

@@ -204,7 +204,6 @@
     },
     "tasks": {
         "build": [
-            "increment_build",
             "compile_sdk"
         ]
     }

build/configs/webword.json

@@ -187,7 +187,6 @@
     },
     "tasks": {
         "build": [
-            "increment_build",
             "compile_sdk"
         ]
     }

build/installtools.bat

-@echo off
-cd /D %~dp0
-
-echo Installation
-call npm install -g grunt-cli
-call npm install

build/update_and_build.bat

-@echo off
-cd /D %~dp0
-
-@echo on
-call grunt
-
-pause
\ No newline at end of file

common/wordcopypaste.js

@@ -380,9 +380,6 @@ function Editor_Copy(api, bCut)
                 __oncut = null;
 
                 if (false === api.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Paragraph_Content)) {
-                    ElemToSelect.innerHTML = "";
-                    Editor_Copy_Event(e, ElemToSelect);
-
 					api.WordControl.m_oLogicDocument.Create_NewHistoryPoint(historydescription_Document_CutHotKey);
                     api.WordControl.m_oLogicDocument.Remove(1, true, true);
                     api.WordControl.m_oLogicDocument.Document_UpdateSelectionState();
@@ -399,14 +396,12 @@ function Editor_Copy(api, bCut)
 
                 ElemToSelect.oncopy = __oncopy;
                 __oncopy = null;
-
-                ElemToSelect.innerHTML = "";
-                Editor_Copy_Event(e, ElemToSelect);
             }
 
             window["AscDesktopEditor"]["Copy"]();
         }
-
+
+		ElemToSelect.innerHTML = "";
         return;
     }