Skip to content

Commit 608e8e2

Browse files
committed
修改timecontrol相关遗留问题 & 增加common相关UT reviewBy zhurc
1 parent 0b16ef8 commit 608e8e2

13 files changed

+417
-29
lines changed

dist/iclient-classic.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3202,7 +3202,7 @@ var TimeFlowControl = function (_TimeControlBase) {
32023202

32033203
if (!me.reverse) {
32043204
//如果相等,则代表上一帧已经运行到了最后,下一帧运行初始化的状态
3205-
if (me.oldTime === me.endTime) {
3205+
if (me.currentTime === me.endTime) {
32063206
//不循环时
32073207
if (!me.repeat) {
32083208
me.running = false;
@@ -5246,9 +5246,7 @@ var TimeControlBase = function () {
52465246
key: "toggle",
52475247
value: function toggle() {
52485248
var me = this;
5249-
if (!connect) {
5250-
return false;
5251-
}
5249+
52525250
if (me.running) {
52535251
me.pause();
52545252
} else {
@@ -7713,7 +7711,7 @@ var TokenServiceParameter = function () {
77137711

77147712

77157713
/**
7716-
* @member SuperMap.TokenServiceParameter.prototype.referer -{string}
7714+
* @member SuperMap.TokenServiceParameter.prototype.ip -{string}
77177715
* @description clientType=Referer 时,必选。如果按照指定 URL 的方式申请令牌,则传递相应的 URL。
77187716
*/
77197717

dist/iclient-classic.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.

dist/iclient9-leaflet.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15257,7 +15257,7 @@ var TimeFlowControl = function (_TimeControlBase) {
1525715257

1525815258
if (!me.reverse) {
1525915259
//如果相等,则代表上一帧已经运行到了最后,下一帧运行初始化的状态
15260-
if (me.oldTime === me.endTime) {
15260+
if (me.currentTime === me.endTime) {
1526115261
//不循环时
1526215262
if (!me.repeat) {
1526315263
me.running = false;
@@ -24038,9 +24038,7 @@ var TimeControlBase = function () {
2403824038
key: "toggle",
2403924039
value: function toggle() {
2404024040
var me = this;
24041-
if (!connect) {
24042-
return false;
24043-
}
24041+
2404424042
if (me.running) {
2404524043
me.pause();
2404624044
} else {
@@ -51006,7 +51004,7 @@ var TokenServiceParameter = function () {
5100651004

5100751005

5100851006
/**
51009-
* @member SuperMap.TokenServiceParameter.prototype.referer -{string}
51007+
* @member SuperMap.TokenServiceParameter.prototype.ip -{string}
5101051008
* @description clientType=Referer 时,必选。如果按照指定 URL 的方式申请令牌,则传递相应的 URL。
5101151009
*/
5101251010

@@ -62340,7 +62338,7 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a
6234062338
/* 382 */
6234162339
/***/ (function(module, exports) {
6234262340

62343-
module.exports = {"_args":[[{"raw":"proj4@2.3.15","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.3.15","spec":"2.3.15","type":"version"},"E:\\git\\iClient9"]],"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inCache":true,"_location":"/proj4","_nodeVersion":"6.1.0","_npmOperationalInternal":{"host":"packages-12-west.internal.npmjs.com","tmp":"tmp/proj4-2.3.15.tgz_1471808262546_0.6752060337457806"},"_npmUser":{"name":"ahocevar","email":"andreas.hocevar@gmail.com"},"_npmVersion":"3.8.6","_phantomChildren":{},"_requested":{"raw":"proj4@2.3.15","scope":null,"escapedName":"proj4","name":"proj4","rawSpec":"2.3.15","spec":"2.3.15","type":"version"},"_requiredBy":["/"],"_resolved":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_shrinkwrap":null,"_spec":"proj4@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"},"dist":{"shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","tarball":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz"},"gitHead":"9fa5249c1f4183d5ddee3c4793dfd7b9f29f1886","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","maintainers":[{"name":"cwmma","email":"calvin.metcalf@gmail.com"},{"name":"ahocevar","email":"andreas.hocevar@gmail.com"}],"name":"proj4","optionalDependencies":{},"readme":"ERROR: No README data found!","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"}
62341+
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":"https://registry.npmjs.org/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"G:\\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"}
6234462342

6234562343
/***/ }),
6234662344
/* 383 */

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.

dist/iclient9-mapboxgl.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8830,7 +8830,7 @@ var TimeFlowControl = function (_TimeControlBase) {
88308830

88318831
if (!me.reverse) {
88328832
//如果相等,则代表上一帧已经运行到了最后,下一帧运行初始化的状态
8833-
if (me.oldTime === me.endTime) {
8833+
if (me.currentTime === me.endTime) {
88348834
//不循环时
88358835
if (!me.repeat) {
88368836
me.running = false;
@@ -22394,9 +22394,7 @@ var TimeControlBase = function () {
2239422394
key: "toggle",
2239522395
value: function toggle() {
2239622396
var me = this;
22397-
if (!connect) {
22398-
return false;
22399-
}
22397+
2240022398
if (me.running) {
2240122399
me.pause();
2240222400
} else {
@@ -37707,7 +37705,7 @@ var TokenServiceParameter = function () {
3770737705

3770837706

3770937707
/**
37710-
* @member SuperMap.TokenServiceParameter.prototype.referer -{string}
37708+
* @member SuperMap.TokenServiceParameter.prototype.ip -{string}
3771137709
* @description clientType=Referer 时,必选。如果按照指定 URL 的方式申请令牌,则传递相应的 URL。
3771237710
*/
3771337711

dist/iclient9-mapboxgl.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.

dist/iclient9-openlayers.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12259,7 +12259,7 @@ var TimeFlowControl = function (_TimeControlBase) {
1225912259

1226012260
if (!me.reverse) {
1226112261
//如果相等,则代表上一帧已经运行到了最后,下一帧运行初始化的状态
12262-
if (me.oldTime === me.endTime) {
12262+
if (me.currentTime === me.endTime) {
1226312263
//不循环时
1226412264
if (!me.repeat) {
1226512265
me.running = false;
@@ -20854,9 +20854,7 @@ var TimeControlBase = function () {
2085420854
key: "toggle",
2085520855
value: function toggle() {
2085620856
var me = this;
20857-
if (!connect) {
20858-
return false;
20859-
}
20857+
2086020858
if (me.running) {
2086120859
me.pause();
2086220860
} else {
@@ -47822,7 +47820,7 @@ var TokenServiceParameter = function () {
4782247820

4782347821

4782447822
/**
47825-
* @member SuperMap.TokenServiceParameter.prototype.referer -{string}
47823+
* @member SuperMap.TokenServiceParameter.prototype.ip -{string}
4782647824
* @description clientType=Referer 时,必选。如果按照指定 URL 的方式申请令牌,则传递相应的 URL。
4782747825
*/
4782847826

dist/iclient9-openlayers.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/control/TimeControlBase.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,7 @@ export default class TimeControlBase {
197197
*/
198198
toggle() {
199199
var me = this;
200-
if (!connect) {
201-
return false;
202-
}
200+
203201
if (me.running) {
204202
me.pause();
205203
} else {

src/common/control/TimeFlowControl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export default class TimeFlowControl extends TimeControlBase {
146146

147147
if (!me.reverse) {
148148
//如果相等,则代表上一帧已经运行到了最后,下一帧运行初始化的状态
149-
if (me.oldTime === me.endTime) {
149+
if (me.currentTime === me.endTime) {
150150
//不循环时
151151
if (!me.repeat) {
152152
me.running = false;

0 commit comments

Comments
 (0)