Browse Source

Resolving conflicts.

pull/214/head
connors 11 years ago
parent
commit
6e90bacbd7
  1. 4
      dist/ratchet.js
  2. 2
      lib/js/push.js

4
dist/ratchet.js vendored

@ -431,7 +431,7 @@
} }
data.title = head.querySelector('title'); data.title = head.querySelector('title');
data.title = data.title && data.title.innerText.trim(); data.title = data.title && data.title.innerText && data.title.innerText.trim();
if (options.transition) data = extendWithDom(data, '.content', body); if (options.transition) data = extendWithDom(data, '.content', body);
else data.contents = body; else data.contents = body;
@ -705,4 +705,4 @@
toggle = false; toggle = false;
}); });
}(); }();

2
lib/js/push.js

@ -397,7 +397,7 @@
} }
data.title = head.querySelector('title'); data.title = head.querySelector('title');
data.title = data.title && data.title.innerText.trim(); data.title = data.title && data.title.innerText && data.title.innerText.trim();
if (options.transition) data = extendWithDom(data, '.content', body); if (options.transition) data = extendWithDom(data, '.content', body);
else data.contents = body; else data.contents = body;

Loading…
Cancel
Save