fix text load cache for util/ajax/loader/text

genify · Oct 25, 2017 · c557938 · c557938
1 parent 3fe9605
commit c557938
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,7 @@
 --------------------------------------------------------
 - BUG修复模块
   * base/util 模块的 _$url2origin 接口支持相对协议
+  * util/ajax/loader/text 修正 XHR 重复加载文本内容时被缓存问题
 
 0.4.5   (2017-09-14)
 --------------------------------------------------------

diff --git a/src/util/ajax/demo/tag.html b/src/util/ajax/demo/tag.html
@@ -3,9 +3,18 @@
   <head>
     <title>test tag</title>
     <meta charset="utf-8"/>
+    <script>
+      function log(m) {
+          var p = document.createElement('p');
+          p.innerHTML = m;
+          document.body.appendChild(p);
+      }
+
+
+    </script>
   </head>
   <body>
-
+    <input type="button" value="加载" onclick="a();"/>
     <script src="../../../define.js"></script>
     <script>
       define([
@@ -14,25 +23,26 @@
 
           _j._$loadTemplate('./b.html',{
               onload:function(result){
-                  console.log('same domain');
-                  console.log(result);
+                  log('same domain');
+                  log(result);
               }
           });
 
           _j._$loadTemplate('http://localhost:8080/nej/src/util/ajax/demo/b.html',{
               onload: function(result){
-                  console.log('same domain');
-                  console.log(result);
+                  log('same domain');
+                  log(result);
               }
           });
 
-          _j._$loadTemplate('http://a.b.com:8080/nej/src/util/ajax/demo/b.html',{
-              onload: function(result){
-                  console.log('cross domain');
-                  console.log(result);
-              }
-          });
-
+          window.a = function (){
+              _j._$loadTemplate('http://a.b.com:8080/nej/src/util/ajax/demo/b.html',{
+                  onload: function(result){
+                      log('cross domain');
+                      log(result);
+                  }
+              });
+          };
       });
     </script>
   </body>

diff --git a/src/util/ajax/loader/text.js b/src/util/ajax/loader/text.js
@@ -34,6 +34,17 @@ NEJ.define([
         this.__doRequest();
         return null;
     };
+    /**
+     * 执行清理任务
+     *
+     * @protected
+     * @method module:util/ajax/loader/style._$$LoaderText#__doClear
+     * @return {Void}
+     */
+    _pro.__doClear = function(){
+        this.__super();
+        this.__getLoadData('loaded')[this.__url] = !1;
+    };
     /**
      * 资源载入
      *

diff --git a/src/util/ajax/tag.js b/src/util/ajax/tag.js
@@ -229,7 +229,9 @@ NEJ.define([
         }else{
             var callback = _options.onload;
             _options.onload = function(event){
-                callback(e._$html2node(event.content));
+                if (!!event){
+                    callback(e._$html2node(event.content));
+                }
             };
             _p._$loadText(_url, _options);
         }