From d18f284f254574444328059528f0f232cda300aa Mon Sep 17 00:00:00 2001 From: echo Date: Sat, 20 Jan 2018 12:48:39 +0800 Subject: [PATCH 1/6] fix bug --- drawMapGUI.html | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drawMapGUI.html b/drawMapGUI.html index b34e30fb..01301fc3 100644 --- a/drawMapGUI.html +++ b/drawMapGUI.html @@ -100,8 +100,8 @@ - - + + @@ -121,7 +121,7 @@ var main={'instance':{}}; var core={}; function editor() { - this.version = "1.2"; + this.version = "1.3.2"; this.material = {}; } // 重构这一堆回调 @@ -449,9 +449,11 @@ editor.prototype.listen = function() { }//在格子内画一个随机色块 function eToLoc(e) { + var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft + var scrollTop = document.documentElement.scrollTop || document.body.scrollTop editor.loc = { - 'x': document.documentElement.scrollLeft+e.clientX - mid.offsetLeft-mapEdit.offsetLeft, - 'y': document.documentElement.scrollTop+e.clientY - mid.offsetTop-mapEdit.offsetTop, + 'x': scrollLeft+e.clientX - mid.offsetLeft-mapEdit.offsetLeft, + 'y': scrollTop+e.clientY - mid.offsetTop-mapEdit.offsetTop, 'size': 32 }; return editor.loc; }//返回可用的组件内坐标 @@ -579,9 +581,11 @@ editor.prototype.listen = function() { data.onmousedown = function (e) { e.stopPropagation(); + var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft + var scrollTop = document.documentElement.scrollTop || document.body.scrollTop var loc = { - 'x': document.documentElement.scrollLeft + e.clientX + iconLib.scrollLeft - right.offsetLeft-iconLib.offsetLeft, - 'y': document.documentElement.scrollTop + e.clientY + iconLib.scrollTop - right.offsetTop-iconLib.offsetTop, + 'x': scrollLeft + e.clientX + iconLib.scrollLeft - right.offsetLeft-iconLib.offsetLeft, + 'y': scrollTop + e.clientY + iconLib.scrollTop - right.offsetTop-iconLib.offsetTop, 'size': 32 }; editor.loc = loc; From 47b5afd8017a1e011725efb1c7205afb3463ce4d Mon Sep 17 00:00:00 2001 From: echo Date: Sat, 20 Jan 2018 13:15:54 +0800 Subject: [PATCH 2/6] fix bug: polyfill old version of IE --- drawMapGUI.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drawMapGUI.html b/drawMapGUI.html index 01301fc3..95d3cb70 100644 --- a/drawMapGUI.html +++ b/drawMapGUI.html @@ -146,7 +146,8 @@ editor.prototype.init = function(){ }); Promise.all([p1, p2, p3]) - .then(function([maps, icons, img]){ + .then(function(results){ + var maps = results[0], icons = results[1]; editor.idsInit(maps, icons); // 初始化图片素材信息 editor.drawInitData(icons); // 初始化绘图 editor.listen(); // 开始监听事件 From b7cd8c0dc1782cbb3d5ed86d095d972a00795da3 Mon Sep 17 00:00:00 2001 From: echo Date: Sat, 20 Jan 2018 13:30:36 +0800 Subject: [PATCH 3/6] fix bug: polyfill old version of IE --- _server/vendor/polyfill.min.js | 1 + drawMapGUI.html | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 _server/vendor/polyfill.min.js diff --git a/_server/vendor/polyfill.min.js b/_server/vendor/polyfill.min.js new file mode 100644 index 00000000..80fe8dc8 --- /dev/null +++ b/_server/vendor/polyfill.min.js @@ -0,0 +1 @@ +!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n():"function"==typeof define&&define.amd?define(n):n()}(0,function(){"use strict";function e(){}function n(e,n){for(;3===e._state;)e=e._value;0!==e._state?(e._handled=!0,f._immediateFn(function(){var i=1===e._state?n.onFulfilled:n.onRejected;if(null!==i){var r;try{r=i(e._value)}catch(e){return void o(n.promise,e)}t(n.promise,r)}else(1===e._state?t:o)(n.promise,e._value)})):e._deferreds.push(n)}function t(e,n){try{if(n===e)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var t=n.then;if(n instanceof f)return e._state=3,e._value=n,void i(e);if("function"==typeof t)return void r(function(e,n){return function(){e.apply(n,arguments)}}(t,n),e)}e._state=1,e._value=n,i(e)}catch(n){o(e,n)}}function o(e,n){e._state=2,e._value=n,i(e)}function i(e){2===e._state&&0===e._deferreds.length&&f._immediateFn(function(){e._handled||f._unhandledRejectionFn(e._value)});for(var t=0,o=e._deferreds.length;o>t;t++)n(e,e._deferreds[t]);e._deferreds=null}function r(e,n){var i=!1;try{e(function(e){i||(i=!0,t(n,e))},function(e){i||(i=!0,o(n,e))})}catch(e){if(i)return;i=!0,o(n,e)}}function f(e){if(!(this instanceof f))throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],r(e,this)}var u=setTimeout,c=f.prototype;c.catch=function(e){return this.then(null,e)},c.then=function(t,o){var i=new this.constructor(e);return n(this,new function(e,n,t){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof n?n:null,this.promise=t}(t,o,i)),i},f.all=function(e){return new f(function(n,t){function o(e,f){try{if(f&&("object"==typeof f||"function"==typeof f)){var u=f.then;if("function"==typeof u)return void u.call(f,function(n){o(e,n)},t)}i[e]=f,0==--r&&n(i)}catch(e){t(e)}}if(!e||void 0===e.length)throw new TypeError("Promise.all accepts an array");var i=Array.prototype.slice.call(e);if(0===i.length)return n([]);for(var r=i.length,f=0;i.length>f;f++)o(f,i[f])})},f.resolve=function(e){return e&&"object"==typeof e&&e.constructor===f?e:new f(function(n){n(e)})},f.reject=function(e){return new f(function(n,t){t(e)})},f.race=function(e){return new f(function(n,t){for(var o=0,i=e.length;i>o;o++)e[o].then(n,t)})},f._immediateFn="function"==typeof setImmediate&&function(e){setImmediate(e)}||function(e){u(e,0)},f._unhandledRejectionFn=function(e){void 0!==console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)};var a=function(){if("undefined"!=typeof self)return self;if("undefined"!=typeof window)return window;if(void 0!==a)return a;throw Error("unable to locate global object")}();a.Promise||(a.Promise=f)}); diff --git a/drawMapGUI.html b/drawMapGUI.html index 95d3cb70..6a8f39ec 100644 --- a/drawMapGUI.html +++ b/drawMapGUI.html @@ -101,9 +101,10 @@ + - +