Skip to content
Snippets Groups Projects
Commit 58771a0c authored by Sebastien's avatar Sebastien
Browse files

Js remove mixed spaces

parent 57d7c4c0
Branches
Tags
3 merge requests!43tuleap-83-access-my-capsules,!42Draft: access-my-capsules-conflicts-fixed,!40Draft: Tuleap 83 access my capsules
Pipeline #701 passed
...@@ -333,7 +333,6 @@ Project.prototype.analyse = function() { ...@@ -333,7 +333,6 @@ Project.prototype.analyse = function() {
var styleImage = ""; var styleImage = "";
if(tag.thumbnail.url != undefined) { if(tag.thumbnail.url != undefined) {
//styleImage = "background-image: url(" + tag.thumbnail.url + ");";//" opacity: 0.5;"; //styleImage = "background-image: url(" + tag.thumbnail.url + ");";//" opacity: 0.5;";
styleImage = "background-image: -webkit-linear-gradient(right bottom, rgba(20,46,51,.60) 0%,rgba(20,46,51,.90) 100%), url(" + tag.thumbnail.url + "); background-image: -moz-linear-gradient(right bottom, rgba(20,46,51,.60) 0%,rgba(20,46,51,.90) 100%), url(" + tag.thumbnail.url + "); background-image: -o-linear-gradient(right bottom, rgba(20,46,51,.60) 0%,rgba(20,46,51,.90) 100%), url(" + tag.thumbnail.url + ");"; styleImage = "background-image: -webkit-linear-gradient(right bottom, rgba(20,46,51,.60) 0%,rgba(20,46,51,.90) 100%), url(" + tag.thumbnail.url + "); background-image: -moz-linear-gradient(right bottom, rgba(20,46,51,.60) 0%,rgba(20,46,51,.90) 100%), url(" + tag.thumbnail.url + "); background-image: -o-linear-gradient(right bottom, rgba(20,46,51,.60) 0%,rgba(20,46,51,.90) 100%), url(" + tag.thumbnail.url + ");";
// styleImage = "background-image: -webkit-linear-gradient(right bottom, "+tag.color.replace(/rgb/g, "rgba").replace(/\)/g, ",.6)")+" 0%,"+tag.color.replace(/rgb/g, "rgba").replace(/\)/g, ",.9)")+" 100%), url(" + tag.thumbnail.url + ");"; // styleImage = "background-image: -webkit-linear-gradient(right bottom, "+tag.color.replace(/rgb/g, "rgba").replace(/\)/g, ",.6)")+" 0%,"+tag.color.replace(/rgb/g, "rgba").replace(/\)/g, ",.9)")+" 100%), url(" + tag.thumbnail.url + ");";
......
...@@ -90,9 +90,6 @@ $(document).ready(function() { ...@@ -90,9 +90,6 @@ $(document).ready(function() {
} }
}); });
$("#popupAlertSpace").click(function(event){ $("#popupAlertSpace").click(function(event){
event.stopPropagation(); event.stopPropagation();
}); });
...@@ -162,7 +159,6 @@ function setEditionControls() { ...@@ -162,7 +159,6 @@ function setEditionControls() {
} }
}); });
$("#flattentimeline").on({ $("#flattentimeline").on({
dragenter: function(event) { dragenter: function(event) {
//$(".flattentimeline_item").removeClass("draggable").addClass("drag"); //$(".flattentimeline_item").removeClass("draggable").addClass("drag");
...@@ -178,7 +174,6 @@ function setEditionControls() { ...@@ -178,7 +174,6 @@ function setEditionControls() {
} }
}); });
$("#left_menu_bottom").click(function(event){ $("#left_menu_bottom").click(function(event){
//var tmp = $(".vjs-marker").css("z-index"); //var tmp = $(".vjs-marker").css("z-index");
//alert("val = "+tmp); //alert("val = "+tmp);
...@@ -224,7 +219,6 @@ function setEditionControls() { ...@@ -224,7 +219,6 @@ function setEditionControls() {
if(rekall_common.owner.canEdit) { if(rekall_common.owner.canEdit) {
$(".empty").show(); $(".empty").show();
} }
}); });
...@@ -440,7 +434,6 @@ function setEditionControls() { ...@@ -440,7 +434,6 @@ function setEditionControls() {
closeInputs(); closeInputs();
}); });
$("#popupLegende").click(function(event){ $("#popupLegende").click(function(event){
event.stopPropagation(); event.stopPropagation();
closeInputs(); closeInputs();
...@@ -467,7 +460,6 @@ function setEditionControls() { ...@@ -467,7 +460,6 @@ function setEditionControls() {
event.stopPropagation(); event.stopPropagation();
}); });
$("#popupNomInput").keyup(function(event){ $("#popupNomInput").keyup(function(event){
event.stopPropagation(); event.stopPropagation();
if(event.which == 13) { if(event.which == 13) {
...@@ -897,7 +889,6 @@ function fillPopupEdit(tag) { ...@@ -897,7 +889,6 @@ function fillPopupEdit(tag) {
} }
else $("#popupLink").html("+ Add a link").addClass("empty"); else $("#popupLink").html("+ Add a link").addClass("empty");
if(rekall_common.owner.canEdit) { if(rekall_common.owner.canEdit) {
if(tag.isMarker()==true) $("#popupEditSupprimer").html("Delete Note"); if(tag.isMarker()==true) $("#popupEditSupprimer").html("Delete Note");
else $("#popupEditSupprimer").html("Delete File"); else $("#popupEditSupprimer").html("Delete File");
......
...@@ -28,7 +28,7 @@ function Source(hash) { ...@@ -28,7 +28,7 @@ function Source(hash) {
Source.prototype.addDocument = function(document) { Source.prototype.addDocument = function(document) {
if(document.key == undefined) { if(document.key == undefined) {
document.key = this.mapPath(Utils.getLocalFilePath(document, "", true, true));; document.key = this.mapPath(Utils.getLocalFilePath(document, "", true, true));
if(document.key == "") if(document.key == "")
document.key = "marker-" + CryptoJS.SHA1(moment() + random() + "").toString(); document.key = "marker-" + CryptoJS.SHA1(moment() + random() + "").toString();
} }
...@@ -63,7 +63,7 @@ Source.prototype.mapPath = function(path) { ...@@ -63,7 +63,7 @@ Source.prototype.mapPath = function(path) {
return retour; return retour;
} }
Source.prototype.addMapping = function(path1, path2) { Source.prototype.addMapping = function(path1, path2) {
var path1Exists = false, path2Exists = false;; var path1Exists = false, path2Exists = false;
for (var pathSrc in this.mapping) { for (var pathSrc in this.mapping) {
var pathDst = this.mapping[pathSrc]; var pathDst = this.mapping[pathSrc];
if((pathSrc == path1) || (pathDst == path1)) if((pathSrc == path1) || (pathDst == path1))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment