From 8b34ffce3fc749acd29613a2551d2e49112dadcd Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 15 Dec 2015 18:20:16 +0800 Subject: [PATCH 1/2] fix non-cached scripts --- site/static/homeLoad.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/static/homeLoad.js b/site/static/homeLoad.js index e317b1def0..1a23a6021e 100644 --- a/site/static/homeLoad.js +++ b/site/static/homeLoad.js @@ -2,6 +2,9 @@ * Created by jljsj on 15/6/3. */ $(function() { + $.ajaxSetup({ + cache: true + }); var loadData = [ "https://os.alipayobjects.com/rmsportal/PfhNcINWBAnMIWR.js", // easeljs-0.8.0.min.js "https://os.alipayobjects.com/rmsportal/nGFyCGHAblMWsYE.js", // TweenMax.min.js From a5808266757c60e3a184bd8d83ffd5daea8a214b Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 9 Dec 2015 16:26:57 +0800 Subject: [PATCH 2/2] fix peerDenpdencies with react-router@1.0.2 Conflicts: package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06c8f9d41c..ba174b47b8 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "expect.js": "~0.3.1", "extract-text-webpack-plugin": "^0.9.1", "gh-pages": "^0.5.0", - "history": "^1.13.1", + "history": "~1.13.1", "jest-cli": "~0.6.1", "json-loader": "^0.5.1", "less": "~2.5.3",