Browse Source

Enable `forin` and `freeze` rules.

pull/379/head
XhmikosR 11 years ago
parent
commit
df5aa2c722
  1. 2
      js/.jshintrc
  2. 8
      js/push.js

2
js/.jshintrc

@ -7,6 +7,8 @@
"eqeqeq" : true, "eqeqeq" : true,
"eqnull" : true, "eqnull" : true,
"expr" : true, "expr" : true,
"forin" : true,
"freeze" : true,
"indent" : 2, "indent" : 2,
"laxbreak" : true, "laxbreak" : true,
"nonbsp" : true, "nonbsp" : true,

8
js/push.js

@ -177,6 +177,7 @@
if (transitionFromObj.transition) { if (transitionFromObj.transition) {
activeObj = extendWithDom(activeObj, '.content', activeDom.cloneNode(true)); activeObj = extendWithDom(activeObj, '.content', activeDom.cloneNode(true));
for (key in bars) { for (key in bars) {
if (bars.hasOwnProperty(key)) {
barElement = document.querySelector(bars[key]); barElement = document.querySelector(bars[key]);
if (activeObj[key]) { if (activeObj[key]) {
swapContent(activeObj[key], barElement); swapContent(activeObj[key], barElement);
@ -185,6 +186,7 @@
} }
} }
} }
}
swapContent( swapContent(
(activeObj.contents || activeDom).cloneNode(true), (activeObj.contents || activeDom).cloneNode(true),
@ -208,8 +210,10 @@
options.container = options.container || options.transition ? document.querySelector('.content') : document.body; options.container = options.container || options.transition ? document.querySelector('.content') : document.body;
for (key in bars) { for (key in bars) {
if (bars.hasOwnProperty(key)) {
options[key] = options[key] || document.querySelector(bars[key]); options[key] = options[key] || document.querySelector(bars[key]);
} }
}
if (xhr && xhr.readyState < 4) { if (xhr && xhr.readyState < 4) {
xhr.onreadystatechange = noop; xhr.onreadystatechange = noop;
@ -269,6 +273,7 @@
if (options.transition) { if (options.transition) {
for (key in bars) { for (key in bars) {
if (bars.hasOwnProperty(key)) {
barElement = document.querySelector(bars[key]); barElement = document.querySelector(bars[key]);
if (data[key]) { if (data[key]) {
swapContent(data[key], barElement); swapContent(data[key], barElement);
@ -277,6 +282,7 @@
} }
} }
} }
}
swapContent(data.contents, options.container, options.transition, function () { swapContent(data.contents, options.container, options.transition, function () {
cacheReplace({ cacheReplace({
@ -408,8 +414,10 @@
var result = {}; var result = {};
for (i in obj) { for (i in obj) {
if (obj.hasOwnProperty(i)) {
result[i] = obj[i]; result[i] = obj[i];
} }
}
Object.keys(bars).forEach(function (key) { Object.keys(bars).forEach(function (key) {
var el = dom.querySelector(bars[key]); var el = dom.querySelector(bars[key]);

Loading…
Cancel
Save