From 4faf4c15e973f318d8f1211dbfd60dd6bf60de73 Mon Sep 17 00:00:00 2001
From: im0qianqian <qian1335661317@qq.com>
Date: Tue, 23 Apr 2019 14:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BB=84=E7=BB=87=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=20localStorage=20=E5=AD=98=E5=82=A8=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

localStorage 存储形式更改为
{
    "key": {
        "data": "data",
        "title": "title",
        "time": "time"
    }
}
结构更清晰
---
 src/jquery.pjax.js | 768 ++++++++++++++++++++++-----------------------
 1 file changed, 383 insertions(+), 385 deletions(-)

diff --git a/src/jquery.pjax.js b/src/jquery.pjax.js
index c6bb207..8d9fac9 100755
--- a/src/jquery.pjax.js
+++ b/src/jquery.pjax.js
@@ -1,394 +1,392 @@
 /*!
  * pjax(ajax + history.pushState) for jquery
- * 
+ *
  * by welefen
  */
-(function($) {
-	var Util = {
-		support : {
-			pjax : window.history && window.history.pushState && window.history.replaceState && !navigator.userAgent.match(/(iPod|iPhone|iPad|WebApps\/.+CFNetwork)/),
-			storage : !!window.localStorage
-		},
-		toInt : function(obj) {
-			return parseInt(obj);
-		},
-		stack : {},
-		getTime : function() {
-			return new Date * 1;
-		},
-		// 获取URL不带hash的部分,切去掉pjax=true部分
-		getRealUrl : function(url) {
-			url = (url || '').replace(/\#.*?$/, '');
-			url = url.replace('?pjax=true&', '?').replace('?pjax=true', '').replace('&pjax=true', '');
-			return url;
-		},
-		// 获取url的hash部分
-		getUrlHash : function(url) {
-			return url.replace(/^[^\#]*(?:\#(.*?))?$/, '$1');
-		},
-		// 获取本地存储的key
-		getLocalKey : function(src) {
-			var s = 'pjax_' + encodeURIComponent(src);
-			return {
-				data : s + '_data',
-				time : s + '_time',
-				title : s + '_title'
-			};
-		},
-		// 清除所有的cache
-		removeAllCache : function() {
-			if (!Util.support.storage)
-				return;
-			for ( var name in localStorage) {
-				if ((name.split('_') || [ '' ])[0] === 'pjax') {
-					delete localStorage[name];
-				}
-			}
-		},
-		// 获取cache
-		getCache : function(src, time, flag) {
-			var item, vkey, tkey, tval;
-			time = Util.toInt(time);
-			if (src in Util.stack) {
-				item = Util.stack[src], ctime = Util.getTime();
-				if ((item.time + time * 1000) > ctime) {
-					return item;
-				} else {
-					delete Util.stack[src];
-				}
-			} else if (flag && Util.support.storage) { // 从localStorage里查询
-				var l = Util.getLocalKey(src);
-				vkey = l.data;
-				tkey = l.time;
-				item = localStorage.getItem(vkey);
-				if (item) {
-					tval = Util.toInt(localStorage.getItem(tkey));
-					if ((tval + time * 1000) > Util.getTime()) {
-						return {
-							data : item,
-							title : localStorage.getItem(l.title)
-						};
-					} else {
-						localStorage.removeItem(vkey);
-						localStorage.removeItem(tkey);
-						localStorage.removeItem(l.title);
-					}
-				}
-			}
-			return null;
-		},
-		// 设置cache
-		setCache : function(src, data, title, flag) {
-			var time = Util.getTime(), key;
-			Util.stack[src] = {
-				data : data,
-				title : title,
-				time : time
-			};
-			if (flag && Util.support.storage) {
-				key = Util.getLocalKey(src);
-				localStorage.setItem(key.data, data);
-				localStorage.setItem(key.time, time);
-				localStorage.setItem(key.title, title);
-			}
-		},
-		// 清除cache
-		removeCache : function(src) {
-			src = Util.getRealUrl(src || location.href);
-			delete Util.stack[src];
-			if (Util.support.storage) {
-				var key = Util.getLocalKey(src);
-				localStorage.removeItem(key.data);
-				localStorage.removeItem(key.time);
-				localStorage.removeItem(key.title);
-			}
-		}
-	};
-	// pjax
-	var pjax = function(options) {
-		options = $.extend({
-			selector : '',
-			container : '',
-			callback : function() {},
-			filter : function() {}
-		}, options);
-		if (!options.container || !options.selector) {
-			throw new Error('selector & container options must be set');
-		}
-		$('body').delegate(options.selector, 'click', function(event) {
-			if (event.which > 1 || event.metaKey) {
-				return true;
-			}
-			var $this = $(this), href = $this.attr('href');
-			// 过滤
-			if (typeof options.filter === 'function') {
-				if (options.filter.call(this, href, this) === true){
-					return true;
-				}
-			}
-			if (href === location.href) {
-				return true;
-			}
-			// 只是hash不同
-			if (Util.getRealUrl(href) == Util.getRealUrl(location.href)) {
-				var hash = Util.getUrlHash(href);
-				if (hash) {
-					location.hash = hash;
-					options.callback && options.callback.call(this, {
-						type : 'hash'
-					});
-				}
-				return true;
-			}
-			event.preventDefault();
-			options = $.extend(true, options, {
-				url : href,
-				element : this,
-				push: true
-			});
-			// 发起请求
-			pjax.request(options);
-		});
-	};
-	pjax.xhr = null;
-	pjax.options = {};
-	pjax.state = {};
-	
-	// 默认选项
-	pjax.defaultOptions = {
-		timeout : 2000,
-		element : null,
-		cache : 24 * 3600, // 缓存时间, 0为不缓存, 单位为秒
-		storage : true, // 是否使用localstorage将数据保存到本地
-		url : '', // 链接地址
-		push : true, // true is push, false is replace, null for do nothing
-		show : '', // 展示的动画
-		title : '', // 标题
-		titleSuffix : '',// 标题后缀
-		type : 'GET',
-		data : {
-			pjax : true
-		},
-		dataType : 'html',
-		callback : null, // 回调函数
-		// for jquery
-		beforeSend : function(xhr) {
-			$(pjax.options.container).trigger('pjax.start', [ xhr, pjax.options ]);
-			xhr && xhr.setRequestHeader('X-PJAX', true);
-		},
-		error : function() {
-			pjax.options.callback && pjax.options.callback.call(pjax.options.element, {
-				type : 'error'
-			});
-			location.href = pjax.options.url;
-		},
-		complete : function(xhr) {
-			$(pjax.options.container).trigger('pjax.end', [ xhr, pjax.options ]);
-		}
-	};
-	// 展现动画
-	pjax.showFx = {
-		"_default" : function(data, callback, isCached) {
-			this.html(data);
-			callback && callback.call(this, data, isCached);
-		},
-		fade: function(data, callback, isCached){
-			var $this = this;
-			if(isCached){
-				$this.html(data);
-				callback && callback.call($this, data, isCached);
-			}else{
-				this.fadeOut(500, function(){
-					$this.html(data).fadeIn(500, function(){
-						callback && callback.call($this, data, isCached);
-					});
-				});
-			}
-		}
-	}
-	// 展现函数
-	pjax.showFn = function(showType, container, data, fn, isCached) {
-		var fx = null;
-		if (typeof showType === 'function') {
-			fx = showType;
-		} else {
-			if (!(showType in pjax.showFx)) {
-				showType = "_default";
-			}
-			fx = pjax.showFx[showType];
-		}
-		fx && fx.call(container, data, function() {
-			var hash = location.hash;
-			if (hash != '') {
-				location.href = hash;
-				//for FF
-				if(/Firefox/.test(navigator.userAgent)){
-					history.replaceState($.extend({}, pjax.state, {
-						url : null
-					}), document.title);
-				}
-			} else {
-				window.scrollTo(0, 0);
-			}
-			fn && fn.call(this, data, isCached);
-		}, isCached);
-	}
-	// success callback
-	pjax.success = function(data, isCached) {
-		// isCached default is success
-		if (isCached !== true) {
-			isCached = false;
-		}
-		//accept Whole html
-		if (pjax.html) {
-			data = $(data).find(pjax.html).html();
-		}
-		if ((data || '').indexOf('<html') != -1) {
-			pjax.options.callback && pjax.options.callback.call(pjax.options.element, {
-				type : 'error'
-			});
-			location.href = pjax.options.url;
-			return false;
-		}
-		var title = pjax.options.title || "", el;
-		if (title == "" && pjax.options.element) {
-			el = $(pjax.options.element);
-			title = el.attr('title') || el.text();
-		}
-		var matches = data.match(/<title>(.*?)<\/title>/);
-		if (matches) {
-			title = matches[1];
-		}
-		if (title) {
-			if (title.indexOf(pjax.options.titleSuffix) == -1) {
-				title += pjax.options.titleSuffix;
-			}
-		}
-		document.title = title;
-		pjax.state = {
-			container : pjax.options.container,
-			timeout : pjax.options.timeout,
-			cache : pjax.options.cache,
-			storage : pjax.options.storage,
-			show : pjax.options.show,
-			title : title,
-			url : pjax.options.oldUrl
-		};
-		var query = $.param(pjax.options.data);
-		if (query != "") {
-			pjax.state.url = pjax.options.url + (/\?/.test(pjax.options.url) ? "&" : "?") + query;
-		}
-		if (pjax.options.push) {
-			if (!pjax.active) {
-				history.replaceState($.extend({}, pjax.state, {
-					url : null
-				}), document.title);
-				pjax.active = true;
-			}
-			history.pushState(pjax.state, document.title, pjax.options.oldUrl);
-		} else if (pjax.options.push === false) {
-			history.replaceState(pjax.state, document.title, pjax.options.oldUrl);
-		}
-		pjax.options.showFn && pjax.options.showFn(data, function() {
-			pjax.options.callback && pjax.options.callback.call(pjax.options.element,{
-				type : isCached? 'cache' : 'success'
-			});
-		}, isCached);
-		// 设置cache
-		if (pjax.options.cache && !isCached) {
-			Util.setCache(pjax.options.url, data, title, pjax.options.storage);
-		}
-	};
-	
-	// 发送请求
-	pjax.request = function(options) {
-		if(options.hasOwnProperty('data')){
-			pjax.defaultOptions.data=options.data;
-		}
-		options = $.extend(true, pjax.defaultOptions, options);
-		var cache, container = $(options.container);
-		options.oldUrl = options.url;
-		options.url = Util.getRealUrl(options.url);
-		if($(options.element).length){
-			cache = Util.toInt($(options.element).attr('data-pjax-cache'));
-			if (cache) {
-				options.cache = cache;
-			}
-		}
-		if (options.cache === true) {
-			options.cache = 24 * 3600;
-		}
-		options.cache = Util.toInt(options.cache);
-		// 如果将缓存时间设为0，则将之前的缓存也清除
-		if (options.cache === 0) {
-			Util.removeAllCache();
-		}
-		// 展现函数
-		if (!options.showFn) {
-			options.showFn = function(data, fn, isCached) {
-				pjax.showFn(options.show, container, data, fn, isCached);
-			};
-		}
-		pjax.options = options;
-		pjax.options.success = pjax.success;
-		if (options.cache && (cache = Util.getCache(options.url, options.cache, options.storage))) {
-			options.beforeSend();
-			options.title = cache.title;
-			pjax.success(cache.data, true);
-			options.complete();
-			return true;
-		}
-		if (pjax.xhr && pjax.xhr.readyState < 4) {
-			pjax.xhr.onreadystatechange = $.noop;
-			pjax.xhr.abort();
-		}
-		pjax.xhr = $.ajax(pjax.options);
-	};
+(function ($) {
+    var Util = {
+        support: {
+            pjax: window.history && window.history.pushState && window.history.replaceState && !navigator.userAgent.match(/(iPod|iPhone|iPad|WebApps\/.+CFNetwork)/),
+            storage: !!window.localStorage
+        },
+        toInt: function (obj) {
+            return parseInt(obj);
+        },
+        stack: {},
+        getTime: function () {
+            return new Date * 1;
+        },
+        // 获取URL不带hash的部分,切去掉pjax=true部分
+        getRealUrl: function (url) {
+            url = (url || '').replace(/\#.*?$/, '');
+            url = url.replace('?pjax=true&', '?').replace('?pjax=true', '').replace('&pjax=true', '');
+            return url;
+        },
+        // 获取url的hash部分
+        getUrlHash: function (url) {
+            return url.replace(/^[^\#]*(?:\#(.*?))?$/, '$1');
+        },
+        // 获取本地存储的key
+        getLocalKey: function (src) {
+            return 'pjax_' + encodeURIComponent(src);
+        },
+        // 清除所有的cache
+        removeAllCache: function () {
+            if (!Util.support.storage)
+                return;
+            for (var name in localStorage) {
+                if ((name.split('_') || [''])[0] === 'pjax') {
+                    delete localStorage[name];
+                }
+            }
+        },
+        // 获取cache
+        getCache: function (src, time, flag) {
+            var item, vkey, tval;
+            time = Util.toInt(time);
+            if (src in Util.stack) {
+                item = Util.stack[src], ctime = Util.getTime();
+                if ((item.time + time * 1000) > ctime) {
+                    return item;
+                } else {
+                    delete Util.stack[src];
+                }
+            } else if (flag && Util.support.storage) { // 从localStorage里查询
+                vkey = Util.getLocalKey(src);
+                item = localStorage.getItem(vkey);
+                if (item) {
+                    item = JSON.parse(item);
+                    tval = Util.toInt(item.time);
+                    if ((tval + time * 1000) > Util.getTime()) {
+                        return {
+                            data: item.data,
+                            title: item.title
+                        };
+                    } else {
+                        localStorage.removeItem(vkey);
+                    }
+                }
+            }
+            return null;
+        },
+        // 设置cache
+        setCache: function (src, data, title, flag) {
+            var time = Util.getTime(), key;
+            Util.stack[src] = {
+                data: data,
+                title: title,
+                time: time
+            };
+            if (flag && Util.support.storage) {
+                key = Util.getLocalKey(src);
+                try {
+                    localStorage.setItem(key, JSON.stringify({
+                        data: data,
+                        title: title,
+                        time: time
+                    }));
+                } catch (e) {
+                    console.warn("Failed to execute 'setItem' on 'Storage': Setting the value of '" + key + "' exceeded the quota.");
+                }
+            }
+        },
+        // 清除cache
+        removeCache: function (src) {
+            try {
+                src = Util.getRealUrl(src || location.href);
+                delete Util.stack[src];
+                if (Util.support.storage) {
+                    localStorage.removeItem(Util.getLocalKey(src));
+                }
+            } catch (e) {
+            }
+        }
+    };
+    // pjax
+    var pjax = function (options) {
+        options = $.extend({
+            selector: '',
+            container: '',
+            callback: function () { },
+            filter: function () { }
+        }, options);
+        if (!options.container || !options.selector) {
+            throw new Error('selector & container options must be set');
+        }
+        $('body').delegate(options.selector, 'click', function (event) {
+            if (event.which > 1 || event.metaKey) {
+                return true;
+            }
+            var $this = $(this), href = $this.attr('href');
+            // 过滤
+            if (typeof options.filter === 'function') {
+                if (options.filter.call(this, href, this) === true) {
+                    return true;
+                }
+            }
+            if (href === location.href) {
+                return true;
+            }
+            // 只是hash不同
+            if (Util.getRealUrl(href) == Util.getRealUrl(location.href)) {
+                var hash = Util.getUrlHash(href);
+                if (hash) {
+                    location.hash = hash;
+                    options.callback && options.callback.call(this, {
+                        type: 'hash'
+                    });
+                }
+                return true;
+            }
+            event.preventDefault();
+            options = $.extend(true, options, {
+                url: href,
+                element: this,
+                push: true
+            });
+            // 发起请求
+            pjax.request(options);
+        });
+    };
+    pjax.xhr = null;
+    pjax.options = {};
+    pjax.state = {};
 
-	// popstate event
-	var popped = ('state' in window.history), initialURL = location.href;
-	$(window).bind('popstate', function(event) {
-		var initialPop = !popped && location.href == initialURL;
-		popped = true;
-		if (initialPop) return;
-		var state = event.state;
-		if (state && state.container) {
-			if ($(state.container).length) {
-				var data = {
-					url : state.url,
-					container : state.container,
-					push : null,
-					timeout : state.timeout,
-					cache : state.cache,
-					storage : state.storage,
-					title: state.title,
-					element: null
-				};
-				pjax.request(data);
-			} else {
-				window.location = location.href;
-			}
-		}
-	});
+    // 默认选项
+    pjax.defaultOptions = {
+        timeout: 4000,
+        element: null,
+        cache: 24 * 3600, // 缓存时间, 0为不缓存, 单位为秒
+        storage: true, // 是否使用localstorage将数据保存到本地
+        url: '', // 链接地址
+        push: true, // true is push, false is replace, null for do nothing
+        show: '', // 展示的动画
+        title: '', // 标题
+        titleSuffix: '',// 标题后缀
+        type: 'GET',
+        data: {
+            pjax: true
+        },
+        dataType: 'html',
+        callback: null, // 回调函数
+        // for jquery
+        beforeSend: function (xhr) {
+            $(pjax.options.container).trigger('pjax.start', [xhr, pjax.options]);
+            xhr && xhr.setRequestHeader('X-PJAX', true);
+        },
+        error: function () {
+            pjax.options.callback && pjax.options.callback.call(pjax.options.element, {
+                type: 'error'
+            });
+            location.href = pjax.options.url;
+        },
+        complete: function (xhr) {
+            $(pjax.options.container).trigger('pjax.end', [xhr, pjax.options]);
+        }
+    };
+    // 展现动画
+    pjax.showFx = {
+        "_default": function (data, callback, isCached) {
+            this.html(data);
+            callback && callback.call(this, data, isCached);
+        },
+        fade: function (data, callback, isCached) {
+            var $this = this;
+            if (isCached) {
+                $this.html(data);
+                callback && callback.call($this, data, isCached);
+            } else {
+                this.fadeTo(200, .5, function () {
+                    $this.html(data).fadeTo(200, 1, function () {
+                        callback && callback.call($this, data, isCached);
+                    });
+                });
+            }
+        }
+    }
+    // 展现函数
+    pjax.showFn = function (showType, container, data, fn, isCached) {
+        var fx = null;
+        if (typeof showType === 'function') {
+            fx = showType;
+        } else {
+            if (!(showType in pjax.showFx)) {
+                showType = "_default";
+            }
+            fx = pjax.showFx[showType];
+        }
+        fx && fx.call(container, data, function () {
+            var hash = location.hash;
+            if (hash != '') {
+                location.href = hash;
+                //for FF
+                if (/Firefox/.test(navigator.userAgent)) {
+                    history.replaceState($.extend({}, pjax.state, {
+                        url: null
+                    }), document.title);
+                }
+            } else {
+                window.scrollTo(0, 0);
+            }
+            fn && fn.call(this, data, isCached);
+        }, isCached);
+    }
+    // success callback
+    pjax.success = function (data, isCached) {
+        // isCached default is success
+        if (isCached !== true) {
+            isCached = false;
+        }
+        //accept Whole html
+        if (pjax.html) {
+            data = $(data).find(pjax.html).html();
+        }
+        if ((data || '').indexOf('<html') != -1) {
+            pjax.options.callback && pjax.options.callback.call(pjax.options.element, {
+                type: 'error'
+            });
+            location.href = pjax.options.url;
+            return false;
+        }
+        var title = pjax.options.title || "", el;
+        if (title == "" && pjax.options.element) {
+            el = $(pjax.options.element);
+            title = el.attr('title') || el.text();
+        }
+        var matches = data.match(/<title>(.*?)<\/title>/);
+        if (matches) {
+            title = matches[1];
+        }
+        if (title) {
+            if (title.indexOf(pjax.options.titleSuffix) == -1) {
+                title += pjax.options.titleSuffix;
+            }
+        }
+        document.title = title;
+        pjax.state = {
+            container: pjax.options.container,
+            timeout: pjax.options.timeout,
+            cache: pjax.options.cache,
+            storage: pjax.options.storage,
+            show: pjax.options.show,
+            title: title,
+            url: pjax.options.oldUrl
+        };
+        var query = $.param(pjax.options.data);
+        if (query != "") {
+            pjax.state.url = pjax.options.url + (/\?/.test(pjax.options.url) ? "&" : "?") + query;
+        }
+        if (pjax.options.push) {
+            if (!pjax.active) {
+                history.replaceState($.extend({}, pjax.state, {
+                    url: null
+                }), document.title);
+                pjax.active = true;
+            }
+            history.pushState(pjax.state, document.title, pjax.options.oldUrl);
+        } else if (pjax.options.push === false) {
+            history.replaceState(pjax.state, document.title, pjax.options.oldUrl);
+        }
+        pjax.options.showFn && pjax.options.showFn(data, function () {
+            pjax.options.callback && pjax.options.callback.call(pjax.options.element, {
+                type: isCached ? 'cache' : 'success'
+            });
+        }, isCached);
+        // 设置cache
+        if (pjax.options.cache && !isCached) {
+            Util.setCache(pjax.options.url, data, title, pjax.options.storage);
+        }
+    };
 
-	// not support
-	if (!Util.support.pjax) {
-		pjax = function() {
-			return true;
-		};
-		pjax.request = function(options) {
-			if (options && options.url) {
-				location.href = options.url;
-			}
-		};
-	}
-	// pjax bind to $
-	$.pjax = pjax;
-	$.pjax.util = Util;
+    // 发送请求
+    pjax.request = function (options) {
+        if (options.hasOwnProperty('data')) {
+            pjax.defaultOptions.data = options.data;
+        }
+        options = $.extend(true, pjax.defaultOptions, options);
+        var cache, container = $(options.container);
+        options.oldUrl = options.url;
+        options.url = Util.getRealUrl(options.url);
+        if ($(options.element).length) {
+            cache = Util.toInt($(options.element).attr('data-pjax-cache'));
+            if (cache) {
+                options.cache = cache;
+            }
+        }
+        if (options.cache === true) {
+            options.cache = 24 * 3600;
+        }
+        options.cache = Util.toInt(options.cache);
+        // 如果将缓存时间设为0，则将之前的缓存也清除
+        if (options.cache === 0) {
+            Util.removeAllCache();
+        }
+        // 展现函数
+        if (!options.showFn) {
+            options.showFn = function (data, fn, isCached) {
+                pjax.showFn(options.show, container, data, fn, isCached);
+            };
+        }
+        pjax.options = options;
+        pjax.options.success = pjax.success;
+        if (options.cache && (cache = Util.getCache(options.url, options.cache, options.storage))) {
+            options.beforeSend();
+            options.title = cache.title;
+            pjax.success(cache.data, true);
+            options.complete();
+            return true;
+        }
+        if (pjax.xhr && pjax.xhr.readyState < 4) {
+            pjax.xhr.onreadystatechange = $.noop;
+            pjax.xhr.abort();
+        }
+        pjax.xhr = $.ajax(pjax.options);
+    };
 
-	// extra
-	if ($.inArray('state', $.event.props) < 0) {
-		$.event.props.push('state')
-	}
+    // popstate event
+    var popped = ('state' in window.history), initialURL = location.href;
+    $(window).bind('popstate', function (event) {
+        var initialPop = !popped && location.href == initialURL;
+        popped = true;
+        if (initialPop) return;
+        var state = event.state;
+        if (state && state.container) {
+            if ($(state.container).length) {
+                var data = {
+                    url: state.url,
+                    container: state.container,
+                    push: null,
+                    timeout: state.timeout,
+                    cache: state.cache,
+                    storage: state.storage,
+                    title: state.title,
+                    element: null
+                };
+                pjax.request(data);
+            } else {
+                window.location = location.href;
+            }
+        }
+    });
+
+    // not support
+    if (!Util.support.pjax) {
+        pjax = function () {
+            return true;
+        };
+        pjax.request = function (options) {
+            if (options && options.url) {
+                location.href = options.url;
+            }
+        };
+    }
+    // pjax bind to $
+    $.pjax = pjax;
+    $.pjax.util = Util;
+
+    // extra
+    if ($.inArray('state', $.event.props) < 0) {
+        $.event.props.push('state')
+    }
 
 })(jQuery);