- Timestamp:
- 05/27/11 11:10:32 (13 years ago)
- Location:
- branches/2.2/phpgwapi/js
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/phpgwapi/js/browser/browserDetect.js
r4423 r4532 15 15 is_major = parseInt(is_minor); 16 16 } 17 17 18 18 //Konqueror 19 19 20 20 var is_konq = false; 21 21 var kqPos = agt.indexOf('konqueror'); … … 54 54 // Chrome 55 55 ['chrome8', ( agt.indexOf('chrome/8') != -1 ) ], 56 ['chrome11', ( agt.indexOf('chrome/11') != -1 ) ], 56 57 57 58 // EPIPHANY … … 95 96 96 97 // IS SAFARI/KHTML 97 ['safari', ( (agt.indexOf('safari')!=-1) && (agt.indexOf('mac')!=-1)) ],98 ['safari', ( agt.indexOf('safari') != -1 ) ], 98 99 ['khtml', is_khtml ] 99 100 ]; -
branches/2.2/phpgwapi/js/x_tools
-
Property
svn:ignore
set to
.xtools.js.swp
-
Property
svn:ignore
set to
-
branches/2.2/phpgwapi/js/x_tools/xtools.js
r4434 r4532 17 17 { 18 18 var parser = new DOMParser(); 19 var _xmlDoc = parser.parseFromString( pString, "text/xml");19 var _xmlDoc = parser.parseFromString(pString, "text/xml"); 20 20 } 21 21 … … 31 31 { 32 32 var _data = null; 33 34 if ( document.implementation.createDocument ) 33 if ( document.implementation && document.implementation.createDocument ) 35 34 { 36 var xmlHttp = new window.XMLHttpRequest(); 37 xmlHttp.open("GET",pFile + '?' + Date.parse(new Date),false ); 38 xmlHttp.send(null); 39 40 _data = xmlHttp.responseXML.documentElement; 35 XMLDocument.prototype.load = function(filePath) 36 { 37 var xmlhttp = new XMLHttpRequest(); 38 xmlhttp.open("GET", filePath, false); 39 xmlhttp.setRequestHeader("Content-Type","text/xml"); 40 xmlhttp.send(null); 41 var newDOM = xmlhttp.responseXML; 42 if( newDOM ) 43 { 44 var newElt = this.importNode(newDOM.documentElement, true); 45 this.appendChild(newElt); 46 return true; 47 } 48 } 49 50 _data = document.implementation.createDocument("", "", null); 41 51 } 42 52 else 43 { 44 _data = new ActiveXObject( "Msxml2.FreeThreadedDOMDocument" ); 45 _data.async = false; 46 _data.load( pFile + '?' + Date.parse(new Date) ); 47 } 53 _data = new ActiveXObject("Msxml2.FreeThreadedDOMDocument"); 48 54 55 _data.async = false; 56 _data.load( pFile + '?' + Date.parse(new Date)); 49 57 _FILES[pFile] = _data; 50 58 } … … 64 72 pXSL = arguments[1]; 65 73 } 66 67 74 switch ( typeof pXML ) 68 75 { … … 76 83 break; 77 84 default : 78 return { 'error' : 'invalid xml' }85 return {'error':'invalid xml'} 79 86 } 80 81 87 switch ( typeof pXSL ) 82 88 { … … 91 97 92 98 var fragment = null; 93 94 99 if ( window.XSLTProcessor ) 95 100 { … … 101 106 var params = arguments[2]; 102 107 for (var i in params ) 103 if ( params[ i ] && params[ i ].constructor != Function ) 104 xslProc.setParameter(null, String( i ), String( params[i] ) ); 108 xslProc.setParameter(null, i, params[i]); 105 109 } 106 110 107 111 fragment = xslProc.transformToFragment(pXML, document); 108 112 109 // para retornar valor igual ao ie.110 113 var aux = document.createElement("div"); 111 aux.appendChild( fragment);114 aux.appendChild( fragment ); 112 115 fragment = aux.innerHTML; 113 116 } … … 124 127 var params = arguments[2]; 125 128 for (var i in params ) 126 if ( params[ i ] && params[ i ].constructor != Function ) 127 { 128 xslProc.addParameter( String( i ), String( params[i] ), ''); 129 } 129 xslProc.addParameter(i, params[i], ''); 130 130 } 131 131 … … 155 155 { 156 156 var _argv = arguments; 157 this._PATH = ( _argv.length > 0 ) ? _argv[0] : '';158 157 this._PATH = ( _argv.length > 0 ) ? 158 _argv[0] : ''; 159 159 if ( this._PATH != '' && this._PATH.lastIndexOf('/') != (this._PATH.length - 1) ) 160 160 this._PATH += '/'; 161 161 } 162 162 163 163 xtools.prototype.convert = _convert; 164 164 xtools.prototype.load = _load; 165 165 xtools.prototype.parse = _parse;
Note: See TracChangeset
for help on using the changeset viewer.