Skip to content

Various fixes #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Silex wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Various fixes #151

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e26982
Add missing "var"
Silex May 13, 2019
4c98c9b
Add missing ";"
Silex May 13, 2019
d5c2595
Fix small errors
Silex May 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions juxtapose/js/juxtapose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
var photo_info = url.substr(pos);
if (photo_info.indexOf('/') == -1) return null;
if (photo_info.indexOf('/') === 0) photo_info = photo_info.substr(1);
id = photo_info.split("/")[1];
var id = photo_info.split("/")[1];
return id;
},

Expand All @@ -70,7 +70,7 @@
request.open('GET', url, true);
request.onload = function() {
if (request.status >= 200 && request.status < 400){
data = JSON.parse(request.responseText);
var data = JSON.parse(request.responseText);
var flickr_url = self.bestFlickrUrl(data.sizes.size);
self.setFlickrImage(flickr_url);
} else {
Expand Down Expand Up @@ -152,8 +152,8 @@
height: parseInt(getComputedStyle(element).height, 10)
};
} else {
w = element.getBoundingClientRect().right - element.getBoundingClientRect().left;
h = element.getBoundingClientRect().bottom - element.getBoundingClientRect().top;
var w = element.getBoundingClientRect().right - element.getBoundingClientRect().left;
var h = element.getBoundingClientRect().bottom - element.getBoundingClientRect().top;
return {
width: parseInt(w, 10) || 0,
height: parseInt(h, 10) || 0
Expand All @@ -167,7 +167,7 @@
a = 'client';
e = document.documentElement || document.body;
}
return { width : e[ a+'Width' ] , height : e[ a+'Height' ] }
return { width : e[ a+'Width' ] , height : e[ a+'Height' ] };
}

function getPageX(e) {
Expand Down Expand Up @@ -226,6 +226,7 @@
}

function getLeftPercent(slider, input) {
var leftPercent;
if (typeof(input) === "string" || typeof(input) === "number") {
leftPercent = parseInt(input, 10);
} else {
Expand All @@ -243,6 +244,7 @@
}

function getTopPercent(slider, input) {
var topPercent;
if (typeof(input) === "string" || typeof(input) === "number") {
topPercent = parseInt(input, 10);
} else {
Expand Down Expand Up @@ -330,7 +332,7 @@
}

leftPercent = leftPercent.toFixed(2) + "%";
leftPercentNum = parseFloat(leftPercent);
var leftPercentNum = parseFloat(leftPercent);
rightPercent = (100 - leftPercentNum) + "%";

if (leftPercentNum > 0 && leftPercentNum < 100) {
Expand Down Expand Up @@ -362,7 +364,7 @@
},

displayLabel: function(element, labelText) {
label = document.createElement("div");
var label = document.createElement("div");
label.className = 'jx-label';
label.setAttribute('tabindex', 0); //put the controller in the natural tab order of the document

Expand All @@ -371,10 +373,10 @@
},

displayCredits: function() {
credit = document.createElement("div");
var credit = document.createElement("div");
credit.className = "jx-credit";

text = "<em>Photo Credits:</em>";
var text = "<em>Photo Credits:</em>";
if (this.imgBefore.credit) { text += " <em>Before</em> " + this.imgBefore.credit; }
if (this.imgAfter.credit) { text += " <em>After</em> " + this.imgAfter.credit; }

Expand Down Expand Up @@ -561,7 +563,7 @@
e = e || window.event;
e.preventDefault();
self.updateSlider(e, true);
animate = true;
var animate = true;

this.addEventListener("mousemove", function(e) {
e = e || window.event;
Expand All @@ -588,7 +590,7 @@
e = e || window.event;
e.preventDefault();
e.stopPropagation();
self.updateSlider(event, false);
self.updateSlider(e, false);
});

});
Expand Down Expand Up @@ -678,18 +680,18 @@
options.mode = w.getAttribute('data-makeresponsive');
}

specificClass = 'juxtapose-' + idx;
var specificClass = 'juxtapose-' + idx;
addClass(element, specificClass);

selector = '.' + specificClass;
var selector = '.' + specificClass;

if (w.innerHTML) {
w.innerHTML = '';
} else {
w.innerText = '';
}

slider = new juxtapose.JXSlider(
var slider = new juxtapose.JXSlider(
selector,
[
{
Expand Down Expand Up @@ -732,8 +734,8 @@

registry.unshift([target, type, listener, function (event) {
event.currentTarget = target;
event.preventDefault = function () { event.returnValue = false };
event.stopPropagation = function () { event.cancelBubble = true };
event.preventDefault = function () { event.returnValue = false; };
event.stopPropagation = function () { event.cancelBubble = true; };
event.target = event.srcElement || target;

listener.call(target, event);
Expand All @@ -748,6 +750,7 @@
return this.detachEvent("on" + type, registry.splice(index, 1)[0][3]);
}
}
return null;
};

WindowPrototype[dispatchEvent] = DocumentPrototype[dispatchEvent] = ElementPrototype[dispatchEvent] = function (eventObject) {
Expand Down