загрузка файлов на мобильных устройствах.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52033 954022d7-b5bf-4e40-9824-e11837661b57

Common/downloaderfiles.js

 function FileHandler()
 {
+	var userAgent = (navigator.userAgent || navigator.vendor || window.opera).toLowerCase();
+
+	var isIos;                  //has full support of features in iOS 4.0+, uses a new window to accomplish this.
+	var isAndroid;              //has full support of GET features in 4.0+ by using a new window. Non-GET is completely unsupported by the browser. See above for specifying a message.
+	var isOtherMobileBrowser;   //there is no way to reliably guess here so all other mobile devices will GET and POST to the current window.
+
+	if (/ip(ad|hone|od)/.test(userAgent)) {
+
+		isIos = true;
+
+	} else if (userAgent.indexOf('android') !== -1) {
+
+		isAndroid = true;
+
+	} else {
+
+		isOtherMobileBrowser = /avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|playbook|silk|iemobile|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(userAgent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|e\-|e\/|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\-|2|g)|yas\-|your|zeto|zte\-/i.test(userAgent.substr(0, 4));
+
+	}
+
     var spnExcelFile;
     this.get = function(file)
     {
-        var frmWindow = getIFrameWindow(file);
-        var frm = frmWindow.document.getElementById("frmFile");
-        frm.submit();
+		if( isIos ){
+			downloadWindow = window.open(file,"_parent","",false);
+			downloadWindow.document.title = "Downloading...";
+			window.focus();
+		}
+		else{
+			var frmWindow = getIFrameWindow(file);
+			var frm = frmWindow.document.getElementById("frmFile");
+			frm.submit();
+		}
     }
     var getIFrameWindow = function(file) 
     {

Excel/api.js

@@ -719,10 +719,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 					this.handlers.trigger("asc_onSaveUrl", url, function(hasError){});
 				else
 				{
-					if( this.isMobileVersion )
-						window.open("../../../sdk/Common/MobileDownloader/download.html?file="+encodeURIComponent(url),"_parent","",false);
-					else
-						getFile(url);
+					getFile(url);
 				}
 			},
 			// Опции страницы (для печати)

PowerPoint/api.js

@@ -1396,10 +1396,7 @@ asc_docs_api.prototype.processSavedFile = function(url, bInner){
 		editor.asc_fireCallback("asc_onSaveUrl", url, function(hasError){});
 	else
 	{
-		if( editor.isMobileVersion )
-			window.open("../../../sdk/Common/MobileDownloader/download.html?file="+encodeURIComponent(url),"_parent","",false);
-		else
-			getFile(url);
+		getFile(url);
 	}
 }
 asc_docs_api.prototype.asc_DownloadAs = function(typeFile){//передаем число соответствующее своему формату.

Word/api.js

@@ -2693,10 +2693,7 @@ asc_docs_api.prototype.processSavedFile = function(url, bInner)
 	}
 	else
 	{
-		if( this.isMobileVersion )
-			window.open("../../../sdk/Common/MobileDownloader/download.html?file="+encodeURIComponent(url),"_parent","",false);
-		else
-			getFile(url);
+		getFile(url);
 	}	
 }
 asc_docs_api.prototype.startGetDocInfo = function(){

Word/index_mobile.html

@@ -70,7 +70,8 @@
         <script type="text/javascript" src="../../common/locale.js"></script>
 
         <!-- SDK -->
-        <script type="text/javascript" src="../../../../OfficeWeb/Common/editorscommon.js"></script>
+        	<script type="text/javascript" src="../../../../OfficeWeb/Common/browser.js"></script>
+	<script type="text/javascript" src="../../../../OfficeWeb/Common/editorscommon.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/downloaderfiles.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/docscoapicommon.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/docscoapi.js"></script>
@@ -89,12 +90,7 @@
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/commonDefines.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/SerializeCommonWordExcel.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.core.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.annotate.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.context.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.effects.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.key.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.resizing.js"></script>
-	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.common.zoom.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.bar.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.hbar.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/libraries/OfficeExcel.line.js"></script>
@@ -132,6 +128,13 @@
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/CreateGeometry.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/Path.js"></script>
 
+    <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/Chart.js"></script>
+    <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/ChartLayout.js"></script>
+    <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/ChartLegend.js"></script>
+    <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/ChartTitle.js"></script>
+    <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/TextBody.js"></script>
+
+    <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Metafile.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/CollaborativeEditing.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Comments.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/History.js"></script>
@@ -160,7 +163,6 @@
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/ColorArray.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Overlay.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/ShapeDrawer.js"></script>
-    <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/Metafile.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/DrawingDocument.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/GraphicsEvents.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/scrolls/iscroll.js"></script>
@@ -174,6 +176,8 @@
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/api.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/document/empty.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Common/scroll.js"></script>
+	
+	<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/CollaborativeEditing.js"></script>
 
     <script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/EditorSettings.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/Serialize.js"></script>