Skip to content

Commit 5402119

Browse files
songyumengsongyumeng
committed
修复ie8下压缩后的文件报错
1 parent b36612e commit 5402119

File tree

6 files changed

+168
-138
lines changed

6 files changed

+168
-138
lines changed

‎dist/iclient9-leaflet.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iclient9-leaflet.js

Lines changed: 159 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -49437,6 +49437,8 @@ Object.defineProperty(exports, "__esModule", {
4943749437
value: true
4943849438
});
4943949439

49440+
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
49441+
4944049442
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
4944149443

4944249444
/**
@@ -49445,118 +49447,129 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
4944549447
* 环境识别
4944649448
*
4944749449
*/
49448-
var Env = exports.Env = function Env() {
49449-
_classCallCheck(this, Env);
49450+
var Env = exports.Env = function () {
49451+
function Env() {
49452+
_classCallCheck(this, Env);
4945049453

49451-
// Zepto.js
49452-
// (c) 2010-2013 Thomas Fuchs
49453-
// Zepto.js may be freely distributed under the MIT license.
49454-
this.CLASS_NAME = "SuperMap.LevelRenderer.Tool.Env";
49455-
var me = this;
49456-
function detect(ua) {
49457-
var os = me.os = {};
49458-
var browser = me.browser = {};
49459-
var webkit = ua.match(/Web[kK]it[\/]{0,1}([\d.]+)/);
49460-
var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
49461-
var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
49462-
var ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
49463-
var iphone = !ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/);
49464-
var webos = ua.match(/(webOS|hpwOS)[\s\/]([\d.]+)/);
49465-
var touchpad = webos && ua.match(/TouchPad/);
49466-
var kindle = ua.match(/Kindle\/([\d.]+)/);
49467-
var silk = ua.match(/Silk\/([\d._]+)/);
49468-
var blackberry = ua.match(/(BlackBerry).*Version\/([\d.]+)/);
49469-
var bb10 = ua.match(/(BB10).*Version\/([\d.]+)/);
49470-
var rimtabletos = ua.match(/(RIM\sTablet\sOS)\s([\d.]+)/);
49471-
var playbook = ua.match(/PlayBook/);
49472-
var chrome = ua.match(/Chrome\/([\d.]+)/) || ua.match(/CriOS\/([\d.]+)/);
49473-
var firefox = ua.match(/Firefox\/([\d.]+)/);
49474-
var ie = ua.match(/MSIE ([\d.]+)/);
49475-
var safari = webkit && ua.match(/Mobile\//) && !chrome;
49476-
var webview = ua.match(/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/) && !chrome;
49454+
// Zepto.js
49455+
// (c) 2010-2013 Thomas Fuchs
49456+
// Zepto.js may be freely distributed under the MIT license.
49457+
this.CLASS_NAME = "SuperMap.LevelRenderer.Tool.Env";
49458+
var me = this;
49459+
function detect(ua) {
49460+
var os = me.os = {};
49461+
var browser = me.browser = {};
49462+
var webkit = ua.match(/Web[kK]it[\/]{0,1}([\d.]+)/);
49463+
var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
49464+
var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
49465+
var ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
49466+
var iphone = !ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/);
49467+
var webos = ua.match(/(webOS|hpwOS)[\s\/]([\d.]+)/);
49468+
var touchpad = webos && ua.match(/TouchPad/);
49469+
var kindle = ua.match(/Kindle\/([\d.]+)/);
49470+
var silk = ua.match(/Silk\/([\d._]+)/);
49471+
var blackberry = ua.match(/(BlackBerry).*Version\/([\d.]+)/);
49472+
var bb10 = ua.match(/(BB10).*Version\/([\d.]+)/);
49473+
var rimtabletos = ua.match(/(RIM\sTablet\sOS)\s([\d.]+)/);
49474+
var playbook = ua.match(/PlayBook/);
49475+
var chrome = ua.match(/Chrome\/([\d.]+)/) || ua.match(/CriOS\/([\d.]+)/);
49476+
var firefox = ua.match(/Firefox\/([\d.]+)/);
49477+
var ie = ua.match(/MSIE ([\d.]+)/);
49478+
var safari = webkit && ua.match(/Mobile\//) && !chrome;
49479+
var webview = ua.match(/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/) && !chrome;
4947749480

49478-
// Todo: clean this up with a better OS/browser seperation:
49479-
// - discern (more) between multiple browsers on android
49480-
// - decide if kindle fire in silk mode is android or not
49481-
// - Firefox on Android doesn't specify the Android version
49482-
// - possibly devide in os, device and browser hashes
49481+
// Todo: clean this up with a better OS/browser seperation:
49482+
// - discern (more) between multiple browsers on android
49483+
// - decide if kindle fire in silk mode is android or not
49484+
// - Firefox on Android doesn't specify the Android version
49485+
// - possibly devide in os, device and browser hashes
4948349486

49484-
/*eslint-disable*/
49485-
if (browser.webkit = !!webkit) {
49486-
browser.version = webkit[1];
49487-
}
49487+
/*eslint-disable*/
49488+
if (browser.webkit = !!webkit) {
49489+
browser.version = webkit[1];
49490+
}
4948849491

49489-
if (android) {
49490-
os.android = true, os.version = android[2];
49491-
}
49492-
if (iphone && !ipod) {
49493-
os.ios = os.iphone = true, os.version = iphone[2].replace(/_/g, '.');
49494-
}
49495-
if (ipad) {
49496-
os.ios = os.ipad = true, os.version = ipad[2].replace(/_/g, '.');
49497-
}
49498-
if (ipod) {
49499-
os.ios = os.ipod = true, os.version = ipod[3] ? ipod[3].replace(/_/g, '.') : null;
49500-
}
49501-
if (webos) {
49502-
os.webos = true, os.version = webos[2];
49503-
}
49504-
if (touchpad) {
49505-
os.touchpad = true;
49506-
}
49507-
if (blackberry) {
49508-
os.blackberry = true, os.version = blackberry[2];
49509-
}
49510-
if (bb10) {
49511-
os.bb10 = true, os.version = bb10[2];
49512-
}
49513-
if (rimtabletos) {
49514-
os.rimtabletos = true, os.version = rimtabletos[2];
49515-
}
49516-
if (playbook) {
49517-
browser.playbook = true;
49518-
}
49519-
if (kindle) {
49520-
os.kindle = true, os.version = kindle[1];
49521-
}
49522-
if (silk) {
49523-
browser.silk = true, browser.version = silk[1];
49524-
}
49525-
if (!silk && os.android && ua.match(/Kindle Fire/)) {
49526-
browser.silk = true;
49527-
}
49528-
if (chrome) {
49529-
browser.chrome = true, browser.version = chrome[1];
49530-
}
49531-
if (firefox) {
49532-
browser.firefox = true, browser.version = firefox[1];
49533-
}
49534-
if (ie) {
49535-
browser.ie = true, browser.version = ie[1];
49536-
}
49537-
if (safari && (ua.match(/Safari/) || !!os.ios)) {
49538-
browser.safari = true;
49539-
}
49540-
if (webview) {
49541-
browser.webview = true;
49542-
}
49543-
if (ie) {
49544-
browser.ie = true, browser.version = ie[1];
49545-
}
49492+
if (android) {
49493+
os.android = true, os.version = android[2];
49494+
}
49495+
if (iphone && !ipod) {
49496+
os.ios = os.iphone = true, os.version = iphone[2].replace(/_/g, '.');
49497+
}
49498+
if (ipad) {
49499+
os.ios = os.ipad = true, os.version = ipad[2].replace(/_/g, '.');
49500+
}
49501+
if (ipod) {
49502+
os.ios = os.ipod = true, os.version = ipod[3] ? ipod[3].replace(/_/g, '.') : null;
49503+
}
49504+
if (webos) {
49505+
os.webos = true, os.version = webos[2];
49506+
}
49507+
if (touchpad) {
49508+
os.touchpad = true;
49509+
}
49510+
if (blackberry) {
49511+
os.blackberry = true, os.version = blackberry[2];
49512+
}
49513+
if (bb10) {
49514+
os.bb10 = true, os.version = bb10[2];
49515+
}
49516+
if (rimtabletos) {
49517+
os.rimtabletos = true, os.version = rimtabletos[2];
49518+
}
49519+
if (playbook) {
49520+
browser.playbook = true;
49521+
}
49522+
if (kindle) {
49523+
os.kindle = true, os.version = kindle[1];
49524+
}
49525+
if (silk) {
49526+
browser.silk = true, browser.version = silk[1];
49527+
}
49528+
if (!silk && os.android && ua.match(/Kindle Fire/)) {
49529+
browser.silk = true;
49530+
}
49531+
if (chrome) {
49532+
browser.chrome = true, browser.version = chrome[1];
49533+
}
49534+
if (firefox) {
49535+
browser.firefox = true, browser.version = firefox[1];
49536+
}
49537+
if (ie) {
49538+
browser.ie = true, browser.version = ie[1];
49539+
}
49540+
if (safari && (ua.match(/Safari/) || !!os.ios)) {
49541+
browser.safari = true;
49542+
}
49543+
if (webview) {
49544+
browser.webview = true;
49545+
}
49546+
if (ie) {
49547+
browser.ie = true, browser.version = ie[1];
49548+
}
4954649549

49547-
os.tablet = !!(ipad || playbook || android && !ua.match(/Mobile/) || firefox && ua.match(/Tablet/) || ie && !ua.match(/Phone/) && ua.match(/Touch/));
49548-
os.phone = !!(!os.tablet && !os.ipod && (android || iphone || webos || blackberry || bb10 || chrome && ua.match(/Android/) || chrome && ua.match(/CriOS\/([\d.]+)/) || firefox && ua.match(/Mobile/) || ie && ua.match(/Touch/)));
49550+
os.tablet = !!(ipad || playbook || android && !ua.match(/Mobile/) || firefox && ua.match(/Tablet/) || ie && !ua.match(/Phone/) && ua.match(/Touch/));
49551+
os.phone = !!(!os.tablet && !os.ipod && (android || iphone || webos || blackberry || bb10 || chrome && ua.match(/Android/) || chrome && ua.match(/CriOS\/([\d.]+)/) || firefox && ua.match(/Mobile/) || ie && ua.match(/Touch/)));
4954949552

49550-
return {
49551-
browser: browser,
49552-
os: os,
49553-
// 原生canvas支持
49554-
canvasSupported: document.createElement('canvas').getContext ? true : false
49555-
};
49553+
return {
49554+
browser: browser,
49555+
os: os,
49556+
// 原生canvas支持
49557+
canvasSupported: document.createElement('canvas').getContext ? true : false
49558+
};
49559+
}
49560+
49561+
return detect(navigator.userAgent);
4955649562
}
4955749563

49558-
return detect(navigator.userAgent);
49559-
};
49564+
_createClass(Env, [{
49565+
key: 'destory',
49566+
value: function destory() {
49567+
return true;
49568+
}
49569+
}]);
49570+
49571+
return Env;
49572+
}();
4956049573

4956149574
/***/ }),
4956249575
/* 266 */
@@ -51267,6 +51280,8 @@ Object.defineProperty(exports, "__esModule", {
5126751280
});
5126851281
exports.Log = undefined;
5126951282

51283+
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
51284+
5127051285
var _Config = __webpack_require__(77);
5127151286

5127251287
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -51277,40 +51292,50 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
5127751292
* LevelRenderer 工具-日志
5127851293
*
5127951294
*/
51280-
var Log =
51295+
var Log = exports.Log = function () {
5128151296

51282-
/**
51283-
* Constructor: SuperMap.LevelRenderer.Tool.Log
51284-
* 构造函数。
51285-
*
51286-
*/
51287-
exports.Log = function Log() {
51288-
_classCallCheck(this, Log);
51297+
/**
51298+
* Constructor: SuperMap.LevelRenderer.Tool.Log
51299+
* 构造函数。
51300+
*
51301+
*/
51302+
function Log() {
51303+
_classCallCheck(this, Log);
5128951304

51290-
this.CLASS_NAME = "SuperMap.LevelRenderer.Tool.Log";
51291-
return function () {
51292-
if (_Config.Config.debugMode === 0) {
51293-
return;
51294-
} else if (_Config.Config.debugMode == 1) {
51295-
for (var k in arguments) {
51296-
throw new Error(arguments[k]);
51297-
}
51298-
} else if (_Config.Config.debugMode > 1) {
51299-
for (var _k in arguments) {
51300-
console.log(arguments[_k]);
51305+
this.CLASS_NAME = "SuperMap.LevelRenderer.Tool.Log";
51306+
return function () {
51307+
if (_Config.Config.debugMode === 0) {
51308+
return;
51309+
} else if (_Config.Config.debugMode == 1) {
51310+
for (var k in arguments) {
51311+
throw new Error(arguments[k]);
51312+
}
51313+
} else if (_Config.Config.debugMode > 1) {
51314+
for (var _k in arguments) {
51315+
console.log(arguments[_k]);
51316+
}
5130151317
}
51318+
};
51319+
51320+
/* for debug
51321+
return function(mes) {
51322+
document.getElementById('wrong-message').innerHTML =
51323+
mes + ' ' + (new Date() - 0)
51324+
+ '<br/>'
51325+
+ document.getElementById('wrong-message').innerHTML;
51326+
};
51327+
*/
51328+
}
51329+
51330+
_createClass(Log, [{
51331+
key: "destory",
51332+
value: function destory() {
51333+
return true;
5130251334
}
51303-
};
51335+
}]);
5130451336

51305-
/* for debug
51306-
return function(mes) {
51307-
document.getElementById('wrong-message').innerHTML =
51308-
mes + ' ' + (new Date() - 0)
51309-
+ '<br/>'
51310-
+ document.getElementById('wrong-message').innerHTML;
51311-
};
51312-
*/
51313-
};
51337+
return Log;
51338+
}();
5131451339

5131551340
/***/ }),
5131651341
/* 271 */
@@ -93944,7 +93969,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
9394493969
/* 500 */
9394593970
/***/ (function(module, exports) {
9394693971

93947-
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"F:\\codes\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"}
93972+
module.exports = {"_args":[["proj4@2.3.15","E:\\git\\iClient9"]],"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz","_spec":"2.3.15","_where":"E:\\git\\iClient9","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"}
9394893973

9394993974
/***/ }),
9395093975
/* 501 */

‎dist/iclient9-leaflet.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iclient9-leaflet.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/common/overlay/levelRenderer/Env.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,7 @@ export class Env {
118118

119119
return detect(navigator.userAgent);
120120
}
121-
121+
destory() {
122+
return true;
123+
}
122124
}

‎src/common/overlay/levelRenderer/Log.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,7 @@ export class Log {
4040
*/
4141
}
4242

43+
destory() {
44+
return true;
45+
}
4346
}

0 commit comments

Comments
 (0)