Fix indentation and semicolon usage
This commit is contained in:
John Firebaugh
parent
1673851b50
commit
8fb3d7365f
3 changed files with 227 additions and 227 deletions
|
|
@ -1,144 +1,144 @@
|
|||
OSM.NewNote = function(map) {
|
||||
var noteLayer = map.noteLayer,
|
||||
content = $('#sidebar_content'),
|
||||
page = {},
|
||||
addNoteButton = $(".control-note .control-button"),
|
||||
newNote;
|
||||
var noteLayer = map.noteLayer,
|
||||
content = $('#sidebar_content'),
|
||||
page = {},
|
||||
addNoteButton = $(".control-note .control-button"),
|
||||
newNote;
|
||||
|
||||
var noteIcons = {
|
||||
"new": L.icon({
|
||||
iconUrl: "<%= image_path 'new_note_marker.png' %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
}),
|
||||
"open": L.icon({
|
||||
iconUrl: "<%= image_path 'open_note_marker.png' %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
}),
|
||||
"closed": L.icon({
|
||||
iconUrl: "<%= image_path 'closed_note_marker.png' %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
})
|
||||
};
|
||||
var noteIcons = {
|
||||
"new": L.icon({
|
||||
iconUrl: "<%= image_path 'new_note_marker.png' %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
}),
|
||||
"open": L.icon({
|
||||
iconUrl: "<%= image_path 'open_note_marker.png' %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
}),
|
||||
"closed": L.icon({
|
||||
iconUrl: "<%= image_path 'closed_note_marker.png' %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
})
|
||||
};
|
||||
|
||||
page.pushstate = page.popstate = function() {
|
||||
page.load();
|
||||
};
|
||||
page.pushstate = page.popstate = function () {
|
||||
page.load();
|
||||
};
|
||||
|
||||
addNoteButton.on("click", function (e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
addNoteButton.on("click", function (e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
||||
OSM.route('/new_note');
|
||||
OSM.route('/new_note');
|
||||
});
|
||||
|
||||
function createNote(marker, form, url) {
|
||||
var location = marker.getLatLng();
|
||||
|
||||
marker.options.draggable = false;
|
||||
marker.dragging.disable();
|
||||
|
||||
$(form).find("input[type=submit]").prop("disabled", true);
|
||||
|
||||
$.ajax({
|
||||
url: url,
|
||||
type: "POST",
|
||||
oauth: true,
|
||||
data: {
|
||||
lat: location.lat,
|
||||
lon: location.lng,
|
||||
text: $(form.text).val()
|
||||
},
|
||||
success: function (feature) {
|
||||
noteCreated(feature, marker);
|
||||
}
|
||||
});
|
||||
|
||||
function createNote(marker, form, url) {
|
||||
var location = marker.getLatLng();
|
||||
function noteCreated(feature, marker) {
|
||||
content.find("textarea").val("");
|
||||
updateMarker(feature);
|
||||
newNote = null;
|
||||
noteLayer.removeLayer(marker);
|
||||
addNoteButton.removeClass("active");
|
||||
OSM.route('/browse/note/' + feature.properties.id);
|
||||
}
|
||||
}
|
||||
|
||||
marker.options.draggable = false;
|
||||
marker.dragging.disable();
|
||||
function updateMarker(feature) {
|
||||
marker = L.marker(feature.geometry.coordinates.reverse(), {
|
||||
icon: noteIcons[feature.properties.status],
|
||||
opacity: 0.9,
|
||||
clickable: true
|
||||
});
|
||||
marker.id = feature.properties.id;
|
||||
marker.addTo(noteLayer);
|
||||
return marker;
|
||||
}
|
||||
|
||||
$(form).find("input[type=submit]").prop("disabled", true);
|
||||
function initialize() {
|
||||
if (addNoteButton.hasClass("disabled")) return;
|
||||
if (addNoteButton.hasClass("active")) return;
|
||||
|
||||
$.ajax({
|
||||
url: url,
|
||||
type: "POST",
|
||||
oauth: true,
|
||||
data: {
|
||||
lat: location.lat,
|
||||
lon: location.lng,
|
||||
text: $(form.text).val()
|
||||
},
|
||||
success: function(feature) {
|
||||
noteCreated(feature, marker);
|
||||
}
|
||||
});
|
||||
addNoteButton.addClass("active");
|
||||
|
||||
function noteCreated(feature, marker) {
|
||||
content.find("textarea").val("");
|
||||
updateMarker(feature);
|
||||
newNote = null;
|
||||
noteLayer.removeLayer(marker);
|
||||
addNoteButton.removeClass("active");
|
||||
OSM.route('/browse/note/' + feature.properties.id);
|
||||
map.addLayer(noteLayer);
|
||||
|
||||
var mapSize = map.getSize();
|
||||
var markerPosition;
|
||||
|
||||
if (mapSize.y > 800) {
|
||||
markerPosition = [mapSize.x / 2, mapSize.y / 2];
|
||||
} else if (mapSize.y > 400) {
|
||||
markerPosition = [mapSize.x / 2, 400];
|
||||
} else {
|
||||
markerPosition = [mapSize.x / 2, mapSize.y];
|
||||
}
|
||||
|
||||
newNote = L.marker(map.containerPointToLatLng(markerPosition), {
|
||||
icon: noteIcons["new"],
|
||||
opacity: 0.9,
|
||||
draggable: true
|
||||
});
|
||||
|
||||
newNote.addTo(noteLayer);
|
||||
|
||||
newNote.on("remove", function () {
|
||||
addNoteButton.removeClass("active");
|
||||
}).on("dragstart",function () {
|
||||
$(newNote).stopTime("removenote");
|
||||
}).on("dragend", function () {
|
||||
content.find("textarea").focus();
|
||||
});
|
||||
|
||||
content.find("textarea")
|
||||
.on("input", disableWhenBlank)
|
||||
.focus();
|
||||
|
||||
function disableWhenBlank(e) {
|
||||
$(e.target.form.add).prop("disabled", $(e.target).val() === "");
|
||||
}
|
||||
|
||||
content.find('input[type=submit]').on('click', function (e) {
|
||||
e.preventDefault();
|
||||
createNote(newNote, e.target.form, '/api/0.6/notes.json');
|
||||
});
|
||||
}
|
||||
|
||||
page.load = function () {
|
||||
content.load(window.location.pathname + "?xhr=1", function (a, b, xhr) {
|
||||
if (xhr.getResponseHeader('X-Page-Title')) {
|
||||
document.title = xhr.getResponseHeader('X-Page-Title');
|
||||
}
|
||||
}
|
||||
initialize();
|
||||
});
|
||||
};
|
||||
|
||||
function updateMarker(feature) {
|
||||
marker = L.marker(feature.geometry.coordinates.reverse(), {
|
||||
icon: noteIcons[feature.properties.status],
|
||||
opacity: 0.9,
|
||||
clickable: true
|
||||
});
|
||||
marker.id = feature.properties.id;
|
||||
marker.addTo(noteLayer);
|
||||
return marker;
|
||||
}
|
||||
page.unload = function () {
|
||||
noteLayer.removeLayer(newNote);
|
||||
addNoteButton.removeClass("active");
|
||||
};
|
||||
|
||||
function initialize() {
|
||||
if (addNoteButton.hasClass("disabled")) return;
|
||||
if (addNoteButton.hasClass("active")) return;
|
||||
|
||||
addNoteButton.addClass("active");
|
||||
|
||||
map.addLayer(noteLayer);
|
||||
|
||||
var mapSize = map.getSize();
|
||||
var markerPosition;
|
||||
|
||||
if (mapSize.y > 800) {
|
||||
markerPosition = [mapSize.x / 2, mapSize.y / 2];
|
||||
} else if (mapSize.y > 400) {
|
||||
markerPosition = [mapSize.x / 2, 400];
|
||||
} else {
|
||||
markerPosition = [mapSize.x / 2, mapSize.y];
|
||||
}
|
||||
|
||||
newNote = L.marker(map.containerPointToLatLng(markerPosition), {
|
||||
icon: noteIcons["new"],
|
||||
opacity: 0.9,
|
||||
draggable: true
|
||||
});
|
||||
|
||||
newNote.addTo(noteLayer)
|
||||
|
||||
newNote.on("remove", function (e) {
|
||||
addNoteButton.removeClass("active");
|
||||
}).on("dragstart", function (e) {
|
||||
$(newNote).stopTime("removenote");
|
||||
}).on("dragend", function (e) {
|
||||
content.find("textarea").focus();
|
||||
});
|
||||
|
||||
content.find("textarea")
|
||||
.on("input", disableWhenBlank)
|
||||
.focus();
|
||||
|
||||
function disableWhenBlank(e) {
|
||||
$(e.target.form.add).prop("disabled", $(e.target).val() === "");
|
||||
}
|
||||
|
||||
content.find('input[type=submit]').on('click', function(e) {
|
||||
e.preventDefault();
|
||||
createNote(newNote, e.target.form, '/api/0.6/notes.json');
|
||||
});
|
||||
}
|
||||
|
||||
page.load = function() {
|
||||
content.load(window.location.pathname + "?xhr=1", function(a, b, xhr) {
|
||||
if (xhr.getResponseHeader('X-Page-Title')) {
|
||||
document.title = xhr.getResponseHeader('X-Page-Title');
|
||||
}
|
||||
initialize();
|
||||
});
|
||||
}
|
||||
|
||||
page.unload = function() {
|
||||
noteLayer.removeLayer(newNote);
|
||||
addNoteButton.removeClass("active");
|
||||
}
|
||||
|
||||
return page;
|
||||
}
|
||||
return page;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,101 +1,101 @@
|
|||
OSM.Note = function(map) {
|
||||
var noteLayer = map.noteLayer,
|
||||
content = $('#sidebar_content'),
|
||||
page = {},
|
||||
marker;
|
||||
OSM.Note = function (map) {
|
||||
var noteLayer = map.noteLayer,
|
||||
content = $('#sidebar_content'),
|
||||
page = {},
|
||||
marker;
|
||||
|
||||
var noteIcons = {
|
||||
"new": L.icon({
|
||||
iconUrl: "<%= image_path('new_note_marker.png') %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
}),
|
||||
"open": L.icon({
|
||||
iconUrl: "<%= image_path('open_note_marker.png') %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
}),
|
||||
"closed": L.icon({
|
||||
iconUrl: "<%= image_path('closed_note_marker.png') %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
})
|
||||
};
|
||||
var noteIcons = {
|
||||
"new": L.icon({
|
||||
iconUrl: "<%= image_path('new_note_marker.png') %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
}),
|
||||
"open": L.icon({
|
||||
iconUrl: "<%= image_path('open_note_marker.png') %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
}),
|
||||
"closed": L.icon({
|
||||
iconUrl: "<%= image_path('closed_note_marker.png') %>",
|
||||
iconSize: [25, 40],
|
||||
iconAnchor: [12, 40]
|
||||
})
|
||||
};
|
||||
|
||||
function updateNote(marker, form, method, url) {
|
||||
$(form).find("input[type=submit]").prop("disabled", true);
|
||||
function updateNote(marker, form, method, url) {
|
||||
$(form).find("input[type=submit]").prop("disabled", true);
|
||||
|
||||
$.ajax({
|
||||
url: url,
|
||||
type: method,
|
||||
oauth: true,
|
||||
data: {text: $(form.text).val()},
|
||||
success: function (feature) {
|
||||
marker = noteLayer.getLayer(marker);
|
||||
if (feature.properties.status == "hidden") {
|
||||
noteLayer.removeLayer(marker);
|
||||
} else {
|
||||
marker.setIcon(noteIcons[feature.properties.status]);
|
||||
page.load();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function bind() {
|
||||
content.find("input[type=submit]").on("click", function (e) {
|
||||
e.preventDefault();
|
||||
var data = $(e.target).data();
|
||||
updateNote(data.noteId, e.target.form, data.method, data.url);
|
||||
});
|
||||
|
||||
content.find("textarea").on("input", function (e) {
|
||||
var form = e.target.form;
|
||||
|
||||
if ($(e.target).val() == "") {
|
||||
$(form.close).val(I18n.t("javascripts.notes.show.resolve"));
|
||||
$(form.comment).prop("disabled", true);
|
||||
} else {
|
||||
$(form.close).val(I18n.t("javascripts.notes.show.comment_and_resolve"));
|
||||
$(form.comment).prop("disabled", false);
|
||||
}
|
||||
});
|
||||
|
||||
content.find("textarea").val('').trigger("input");
|
||||
}
|
||||
|
||||
page.pushstate = page.popstate = function() {
|
||||
page.load();
|
||||
};
|
||||
|
||||
page.load = function(path, id) {
|
||||
var loadTimer = setTimeout(setLoading, 250);
|
||||
$('#sidebar_content').load(window.location.pathname + "?xhr=1", function(a, b, xhr) {
|
||||
if (xhr.getResponseHeader('X-Page-Title')) {
|
||||
document.title = xhr.getResponseHeader('X-Page-Title');
|
||||
}
|
||||
bind();
|
||||
clearTimeout(loadTimer);
|
||||
clearLoading();
|
||||
|
||||
if (!map.hasLayer(noteLayer)) map.addLayer(noteLayer);
|
||||
if (window.location.hash == "") map.panTo($('.details').data().coordinates.split(','));
|
||||
});
|
||||
};
|
||||
|
||||
page.unload = function() {
|
||||
if (marker) map.removeLayer(marker);
|
||||
};
|
||||
|
||||
function setLoading() {
|
||||
if($('#browse_status').is(':empty')) {
|
||||
$('#browse_status').append($('<p></p>').text(I18n.t('browse.start_rjs.loading')));
|
||||
$.ajax({
|
||||
url: url,
|
||||
type: method,
|
||||
oauth: true,
|
||||
data: {text: $(form.text).val()},
|
||||
success: function (feature) {
|
||||
marker = noteLayer.getLayer(marker);
|
||||
if (feature.properties.status == "hidden") {
|
||||
noteLayer.removeLayer(marker);
|
||||
} else {
|
||||
marker.setIcon(noteIcons[feature.properties.status]);
|
||||
page.load();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function clearLoading() {
|
||||
$('#browse_status').empty();
|
||||
}
|
||||
function bind() {
|
||||
content.find("input[type=submit]").on("click", function (e) {
|
||||
e.preventDefault();
|
||||
var data = $(e.target).data();
|
||||
updateNote(data.noteId, e.target.form, data.method, data.url);
|
||||
});
|
||||
|
||||
return page;
|
||||
content.find("textarea").on("input", function (e) {
|
||||
var form = e.target.form;
|
||||
|
||||
if ($(e.target).val() == "") {
|
||||
$(form.close).val(I18n.t("javascripts.notes.show.resolve"));
|
||||
$(form.comment).prop("disabled", true);
|
||||
} else {
|
||||
$(form.close).val(I18n.t("javascripts.notes.show.comment_and_resolve"));
|
||||
$(form.comment).prop("disabled", false);
|
||||
}
|
||||
});
|
||||
|
||||
content.find("textarea").val('').trigger("input");
|
||||
}
|
||||
|
||||
page.pushstate = page.popstate = function () {
|
||||
page.load();
|
||||
};
|
||||
|
||||
page.load = function () {
|
||||
var loadTimer = setTimeout(setLoading, 250);
|
||||
$('#sidebar_content').load(window.location.pathname + "?xhr=1", function (a, b, xhr) {
|
||||
if (xhr.getResponseHeader('X-Page-Title')) {
|
||||
document.title = xhr.getResponseHeader('X-Page-Title');
|
||||
}
|
||||
bind();
|
||||
clearTimeout(loadTimer);
|
||||
clearLoading();
|
||||
|
||||
if (!map.hasLayer(noteLayer)) map.addLayer(noteLayer);
|
||||
if (window.location.hash == "") map.panTo($('.details').data().coordinates.split(','));
|
||||
});
|
||||
};
|
||||
|
||||
page.unload = function () {
|
||||
if (marker) map.removeLayer(marker);
|
||||
};
|
||||
|
||||
function setLoading() {
|
||||
if ($('#browse_status').is(':empty')) {
|
||||
$('#browse_status').append($('<p></p>').text(I18n.t('browse.start_rjs.loading')));
|
||||
}
|
||||
}
|
||||
|
||||
function clearLoading() {
|
||||
$('#browse_status').empty();
|
||||
}
|
||||
|
||||
return page;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@ function initializeNotes(map) {
|
|||
newNote = null;
|
||||
});
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
noteLayer.on('click', function(e) {
|
||||
OSM.route('/browse/note/' + e.layer.id);
|
||||
})
|
||||
});
|
||||
|
||||
function updateMarker(marker, feature) {
|
||||
if (marker) {
|
||||
|
|
@ -98,5 +98,5 @@ function initializeNotes(map) {
|
|||
|
||||
noteLoader = null;
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue