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

Make some dirty fixes

Browse Source 
Close #13
This commit is contained in:
Maxime Thirouin
2014-10-14 07:38:06 +02:00
parent fa72f25fd5
commit ce28c1adc3
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -253,7 +253,7 @@ new Pjax({
, switches: { , switches: {
".js-Pjax": Pjax.switches.sideBySide ".js-Pjax": Pjax.switches.sideBySide
} }
, switchesClasses: { , switchesOptions: {
".js-Pjax": { ".js-Pjax": {
classNames: { classNames: {
// class added on the element that will be removed // class added on the element that will be removed

12
src/pjax.js
View File

@@ -499,7 +499,8 @@
} }
, sideBySide: function(oldEl, newEl, options, switchOptions) { , sideBySide: function(oldEl, newEl, options, switchOptions) {
var elsToRemove = [] var forEach = Array.prototype.forEach
, elsToRemove = []
, elsToAdd = [] , elsToAdd = []
, fragToAppend = document.createDocumentFragment() , fragToAppend = document.createDocumentFragment()
// height transition are shitty on safari // height transition are shitty on safari
@@ -548,6 +549,8 @@
// oldEl.parentNode.removeChild(newEl) // oldEl.parentNode.removeChild(newEl)
// oldEl.style.height = oldEl.getBoundingClientRect().height + "px" // oldEl.style.height = oldEl.getBoundingClientRect().height + "px"
switchOptions = switchOptions || {}
forEach.call(oldEl.childNodes, function(el) { forEach.call(oldEl.childNodes, function(el) {
elsToRemove.push(el) elsToRemove.push(el)
if (el.classList && !el.classList.contains("js-Pjax-remove")) { if (el.classList && !el.classList.contains("js-Pjax-remove")) {
@@ -560,7 +563,9 @@
if (switchOptions.callbacks && switchOptions.callbacks.removeElement) { if (switchOptions.callbacks && switchOptions.callbacks.removeElement) {
switchOptions.callbacks.removeElement(el) switchOptions.callbacks.removeElement(el)
} }
if (switchOptions.classNames) {
el.className += " " + switchOptions.classNames.remove + " " + (options.backward ? switchOptions.classNames.backward : switchOptions.classNames.forward) el.className += " " + switchOptions.classNames.remove + " " + (options.backward ? switchOptions.classNames.backward : switchOptions.classNames.forward)
}
animatedElsNumber++ animatedElsNumber++
Pjax.on(el, animationEventNames, sexyAnimationEnd, true) Pjax.on(el, animationEventNames, sexyAnimationEnd, true)
} }
@@ -568,7 +573,10 @@
forEach.call(newEl.childNodes, function(el) { forEach.call(newEl.childNodes, function(el) {
if (el.classList) { if (el.classList) {
var addClasses = " js-Pjax-add " + switchOptions.classNames.add + " " + (options.backward ? switchOptions.classNames.forward : switchOptions.classNames.backward) var addClasses = ""
if (switchOptions.classNames) {
addClasses = " js-Pjax-add " + switchOptions.classNames.add + " " + (options.backward ? switchOptions.classNames.forward : switchOptions.classNames.backward)
}
if (switchOptions.callbacks && switchOptions.callbacks.addElement) { if (switchOptions.callbacks && switchOptions.callbacks.addElement) {
switchOptions.callbacks.addElement(el) switchOptions.callbacks.addElement(el)
} }