arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove html from Tags, Description and Title input

Browse Source
This commit is contained in:
Tobias Reich 2014-06-14 21:38:37 +02:00
parent 0f8a409cec
commit 4bd77f8dbf
4 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
assets/js/album.js
View File

@ -207,7 +207,14 @@ album = {
buttons = [ buttons = [
["Set Title", function() { ["Set Title", function() {
newTitle = ($(".message input.text").val()==="") ? "Untitled" : $(".message input.text").val(); // Get input
newTitle = $(".message input.text").val();
// Remove html from input
newTitle = lychee.removeHTML(newTitle);
// Set to Untitled when empty
newTitle = (newTitle==="") ? "Untitled" : newTitle;
if (visible.album()) { if (visible.album()) {
@ -249,8 +256,12 @@ album = {
buttons = [ buttons = [
["Set Description", function() { ["Set Description", function() {
// Get input
description = $(".message input.text").val(); description = $(".message input.text").val();
// Remove html from input
description = lychee.removeHTML(description);
if (visible.album()) { if (visible.album()) {
album.json.description = description; album.json.description = description;
view.album.description(); view.album.description();

8
assets/js/lychee.js
View File

@ -336,6 +336,14 @@ var lychee = {
}, },
removeHTML: function(html) {
var tmp = document.createElement("DIV");
tmp.innerHTML = html;
return tmp.textContent || tmp.innerText;
},
error: function(errorThrown, params, data) { error: function(errorThrown, params, data) {
console.log("Error Description: " + errorThrown); console.log("Error Description: " + errorThrown);

11
assets/js/photo.js
View File

@ -207,8 +207,12 @@ photo = {
buttons = [ buttons = [
["Set Title", function() { ["Set Title", function() {
// Get input
newTitle = $(".message input.text").val(); newTitle = $(".message input.text").val();
// Remove html from input
newTitle = lychee.removeHTML(newTitle);
if (visible.photo()) { if (visible.photo()) {
photo.json.title = (newTitle==="") ? "Untitled" : newTitle; photo.json.title = (newTitle==="") ? "Untitled" : newTitle;
view.photo.title(); view.photo.title();
@ -337,8 +341,12 @@ photo = {
buttons = [ buttons = [
["Set Description", function() { ["Set Description", function() {
// Get input
description = $(".message input.text").val(); description = $(".message input.text").val();
// Remove html from input
description = lychee.removeHTML(description);
if (visible.photo()) { if (visible.photo()) {
photo.json.description = description; photo.json.description = description;
view.photo.description(); view.photo.description();
@ -410,6 +418,9 @@ photo = {
tags = tags.replace(/(\ ,\ )|(\ ,)|(,\ )|(,{1,}\ {0,})|(,$|^,)/g, ','); tags = tags.replace(/(\ ,\ )|(\ ,)|(,\ )|(,{1,}\ {0,})|(,$|^,)/g, ',');
tags = tags.replace(/,$|^,|(\ ){0,}$/g, ''); tags = tags.replace(/,$|^,|(\ ){0,}$/g, '');
// Remove html from input
tags = lychee.removeHTML(tags);
if (visible.photo()) { if (visible.photo()) {
photo.json.tags = tags; photo.json.tags = tags;
view.photo.tags(); view.photo.tags();

6
assets/min/main.js
View File

File diff suppressed because one or more lines are too long