iLoveElysia/pjax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

changed existing refresh method to reload. changed the data check to trigger a refresh on the element based on the already bound data attr

Browse Source
This commit is contained in:
Peter Lada
2015-01-28 18:27:16 -08:00
parent e6a35f38e4
commit 9a86044f90
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/proto/attach-link.js
View File

@@ -44,8 +44,8 @@ var linkAction = function(el, event) {
// don’t do "nothing" if user try to reload the page by clicking the same link twice // don’t do "nothing" if user try to reload the page by clicking the same link twice
if (el.href === window.location.href.split("#")[0]) { if (el.href === window.location.href.split("#")[0]) {
el.setAttribute(attrClick, "refresh") el.setAttribute(attrClick, "reload")
this.refresh() this.reload()
return return
} }
@@ -56,8 +56,6 @@ var linkAction = function(el, event) {
module.exports = function(el) { module.exports = function(el) {
var that = this var that = this
el.setAttribute("data-pjax-enabled", "true");
on(el, "click", function(event) { on(el, "click", function(event) {
linkAction.call(that, el, event) linkAction.call(that, el, event)
}) })

2
lib/proto/parse-element.js
View File

@@ -2,7 +2,7 @@ module.exports = function(el) {
switch (el.tagName.toLowerCase()) { switch (el.tagName.toLowerCase()) {
case "a": case "a":
// only attach link if el does not already have link attached // only attach link if el does not already have link attached
if (!el.getAttribute("data-pjax-enabled")) { if (!el.hasAttribute('data-pjax-click-state')) {
this.attachLink(el) this.attachLink(el)
} }
break break

0
lib/refresh.js → lib/reload.js
View File

10
tests/index.html
View File

@@ -12091,8 +12091,8 @@ var linkAction = function(el, event) {
// don’t do "nothing" if user try to reload the page by clicking the same link twice // don’t do "nothing" if user try to reload the page by clicking the same link twice
if (el.href === window.location.href.split("#")[0]) { if (el.href === window.location.href.split("#")[0]) {
el.setAttribute(attrClick, "refresh") el.setAttribute(attrClick, "reload")
this.refresh() this.reload()
return return
} }
@@ -12409,8 +12409,8 @@ tape("test attach link prototype method", function(t) {
attachLink.call({ attachLink.call({
options: {}, options: {},
refresh: function() { reload: function() {
t.equal(a.getAttribute(attr), "refresh", "triggering exact same url refresh the page") t.equal(a.getAttribute(attr), "reload", "triggering exact same url reload the page")
}, },
loadUrl: function() { loadUrl: function() {
t.equal(a.getAttribute(attr), "load", "triggering a internal link actually load the page") t.equal(a.getAttribute(attr), "load", "triggering a internal link actually load the page")
@@ -12444,7 +12444,7 @@ tape("test attach link prototype method", function(t) {
a.href = internalUri a.href = internalUri
trigger(a, "click") trigger(a, "click")
// see refresh defined above // see reload defined above
a.href = window.location.protocol + "//" + window.location.host + "/internal" a.href = window.location.protocol + "//" + window.location.host + "/internal"
trigger(a, "click") trigger(a, "click")

6
tests/lib/proto/attach-link.js
View File

@@ -13,8 +13,8 @@ tape("test attach link prototype method", function(t) {
attachLink.call({ attachLink.call({
options: {}, options: {},
refresh: function() { reload: function() {
t.equal(a.getAttribute(attr), "refresh", "triggering exact same url refresh the page") t.equal(a.getAttribute(attr), "reload", "triggering exact same url reload the page")
}, },
loadUrl: function() { loadUrl: function() {
t.equal(a.getAttribute(attr), "load", "triggering a internal link actually load the page") t.equal(a.getAttribute(attr), "load", "triggering a internal link actually load the page")
@@ -48,7 +48,7 @@ tape("test attach link prototype method", function(t) {
a.href = internalUri a.href = internalUri
trigger(a, "click") trigger(a, "click")
// see refresh defined above // see reload defined above
a.href = window.location.protocol + "//" + window.location.host + "/internal" a.href = window.location.protocol + "//" + window.location.host + "/internal"
trigger(a, "click") trigger(a, "click")