Skip to content

Commit

Permalink
Merge branch 'master' of github.com:LimeSurvey/LimeSurvey
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shnoulle
Shnoulle committed Sep 1, 2015
2 parents 063a3bc + c08856e commit 0052231
Show file tree
Hide file tree
Showing 21 changed files with 82 additions and 85 deletions.
8 changes: 4 additions & 4 deletions scripts/admin/admin_core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ $(document).ready(function(){
"height": "toggle", "opacity": "toggle"
});

})
});
$('#hideadvancedattributes').click(function(){
$('#showadvancedattributes').show();
$('#hideadvancedattributes').hide();
$('#advancedquestionsettingswrapper').animate({
"height": "toggle", "opacity": "toggle"
});

})
});
$('#question_type').change(updatequestionattributes);

$('#MinimizeGroupWindow').click(function(){
Expand Down Expand Up @@ -651,7 +651,7 @@ jQuery.fn.center = function () {
this.css("top", ( $(window).height() - this.height() ) / 2+$(window).scrollTop() + "px");
this.css("left", ( $(window).width() - this.width() ) / 2+$(window).scrollLeft() + "px");
return this;
}
};

// Fix broken substr function with negative start value (in older IE)
// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr
Expand All @@ -660,7 +660,7 @@ if ('ab'.substr(-1) != 'b') {
return function(start, length) {
if (start < 0) start = this.length + start;
return substr.call(this, start, length);
}
};
}(String.prototype.substr);
}

Expand Down
32 changes: 16 additions & 16 deletions scripts/admin/answers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $(document).ready(function(){
distance:3});
$('.btnaddanswer').click(addinput);
$('.btndelanswer').click(deleteinput);
$('#editanswersform').submit(checkForDuplicateCodes)
$('#editanswersform').submit(checkForDuplicateCodes);
$('#labelsetbrowser').dialog({ autoOpen: false,
modal: true,
width:800,
Expand Down Expand Up @@ -133,11 +133,11 @@ function addinput()
assessment_type='hidden';
}
if (x==0) {
inserthtml='<tr class="row_'+newposition+'" style="display:none;"><td><img class="handle" src="' + sImageURL + 'handle.png" /></td><td><input class="code" onkeypress="return goodchars(event,\'1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ_\')" type="text" maxlength="5" size="5" required value="'+htmlspecialchars(sNextCode)+'" /></td><td '+assessment_style+'><input class="assessment" type="'+assessment_type+'" maxlength="5" size="5" value="1"/></td><td><input type="text" size="100" class="answer" placeholder="'+htmlspecialchars(newansweroption_text)+'" value="" /><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="' + sImageURL + 'addanswer.png" class="btnaddanswer" /><img src="' + sImageURL + 'deleteanswer.png" class="btndelanswer" /></td></tr>'
inserthtml='<tr class="row_'+newposition+'" style="display:none;"><td><img class="handle" src="' + sImageURL + 'handle.png" /></td><td><input class="code" onkeypress="return goodchars(event,\'1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ_\')" type="text" maxlength="5" size="5" required value="'+htmlspecialchars(sNextCode)+'" /></td><td '+assessment_style+'><input class="assessment" type="'+assessment_type+'" maxlength="5" size="5" value="1"/></td><td><input type="text" size="100" class="answer" placeholder="'+htmlspecialchars(newansweroption_text)+'" value="" /><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="' + sImageURL + 'addanswer.png" class="btnaddanswer" /><img src="' + sImageURL + 'deleteanswer.png" class="btndelanswer" /></td></tr>';
}
else
{
inserthtml='<tr class="row_'+newposition+'" style="display:none;"><td>&nbsp;</td><td>'+htmlspecialchars(sNextCode)+'</td><td><input type="text" size="100" class="answer" placeholder="'+htmlspecialchars(newansweroption_text)+'" value="" /><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td></td></tr>'
inserthtml='<tr class="row_'+newposition+'" style="display:none;"><td>&nbsp;</td><td>'+htmlspecialchars(sNextCode)+'</td><td><input type="text" size="100" class="answer" placeholder="'+htmlspecialchars(newansweroption_text)+'" value="" /><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td></td></tr>';
}
tablerow.after(inserthtml);
tablerow.next().find('.btnaddanswer').click(addinput);
Expand Down Expand Up @@ -238,9 +238,9 @@ function updaterowproperties()
$(this).find('.btneditanswerdis').attr('name','answer_'+language+'_'+rownumber+'_'+scale_id+'_popupctrldis');
highlight=!highlight;
rownumber++;
})
});
$('#answercount_'+scale_id).val(rownumber);
})
});
}

function updatecodes()
Expand All @@ -265,7 +265,7 @@ function getNextCode(sSourceCode)
if (mNumberFound==-1)
{
sBaseCode=sSourceCode;
mNumberFound=0
mNumberFound=0;
}
else
{
Expand Down Expand Up @@ -306,7 +306,7 @@ function checkForDuplicateCodes()
if (areCodesUnique('')==false)
{
alert(duplicateanswercode);
return false
return false;
}
else
{
Expand All @@ -330,7 +330,7 @@ function areCodesUnique(sNewValue)
var codearray=[];
$(this).find('tr .code').each(function(){
codearray.push($(this).val());
})
});
if (sNewValue!='')
{
codearray=codearray.filter( onlyUnique );
Expand All @@ -341,7 +341,7 @@ function areCodesUnique(sNewValue)
dupefound=true;
return;
}
})
});
if (dupefound)
{
return false;
Expand Down Expand Up @@ -550,11 +550,11 @@ function transferlabels()
for (k in lsrows)
{
if (x==0) {
tablerows=tablerows+'<tr class="row_'+k+'" ><td><img class="handle" src="' + sImageURL + 'handle.png" /></td><td><input class="code" onkeypress="return goodchars(event,\'1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ_\')" type="text" maxlength="5" size="5" value="'+htmlspecialchars(lsrows[k].code)+'" /></td><td '+assessment_style+'><input class="assessment" type="'+assessment_type+'" maxlength="5" size="5" value="'+htmlspecialchars(lsrows[k].assessment_value)+'"/></td><td><input type="text" size="100" class="answer" value="'+htmlspecialchars(lsrows[k].title)+'"></input><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="' + sImageURL + 'addanswer.png" class="btnaddanswer" /><img src="' + sImageURL + 'deleteanswer.png" class="btndelanswer" /></td></tr>'
tablerows=tablerows+'<tr class="row_'+k+'" ><td><img class="handle" src="' + sImageURL + 'handle.png" /></td><td><input class="code" onkeypress="return goodchars(event,\'1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ_\')" type="text" maxlength="5" size="5" value="'+htmlspecialchars(lsrows[k].code)+'" /></td><td '+assessment_style+'><input class="assessment" type="'+assessment_type+'" maxlength="5" size="5" value="'+htmlspecialchars(lsrows[k].assessment_value)+'"/></td><td><input type="text" size="100" class="answer" value="'+htmlspecialchars(lsrows[k].title)+'"></input><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="' + sImageURL + 'addanswer.png" class="btnaddanswer" /><img src="' + sImageURL + 'deleteanswer.png" class="btndelanswer" /></td></tr>';
}
else
{
tablerows=tablerows+'<tr class="row_'+k+'" ><td>&nbsp;</td><td>'+htmlspecialchars(lsrows[k].code)+'</td><td><input type="text" size="100" class="answer" value="'+htmlspecialchars(lsrows[k].title)+'"></input><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="' + sImageURL + 'addanswer.png" class="btnaddanswer" /><img src="' + sImageURL + 'deleteanswer.png" class="btndelanswer" /></td></tr>'
tablerows=tablerows+'<tr class="row_'+k+'" ><td>&nbsp;</td><td>'+htmlspecialchars(lsrows[k].code)+'</td><td><input type="text" size="100" class="answer" value="'+htmlspecialchars(lsrows[k].title)+'"></input><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="' + sImageURL + 'addanswer.png" class="btnaddanswer" /><img src="' + sImageURL + 'deleteanswer.png" class="btndelanswer" /></td></tr>';
}
}
}
Expand All @@ -565,7 +565,7 @@ function transferlabels()
var k=0;
for (k in lsrows)
{
tablerows=tablerows+'<tr class="row_'+k+'" ><td>&nbsp;</td><td>'+htmlspecialchars(lsrows[k].code)+'</td><td><input type="text" size="100" class="answer" value="'+htmlspecialchars(lsrows[k].title)+'"></input><a class="editorLink"><img class="btneditanswerena" src="../images/edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="../images/edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="../images/addanswer.png" class="btnaddanswer" /><img src="../images/deleteanswer.png" class="btndelanswer" /></td></tr>'
tablerows=tablerows+'<tr class="row_'+k+'" ><td>&nbsp;</td><td>'+htmlspecialchars(lsrows[k].code)+'</td><td><input type="text" size="100" class="answer" value="'+htmlspecialchars(lsrows[k].title)+'"></input><a class="editorLink"><img class="btneditanswerena" src="../images/edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="../images/edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="../images/addanswer.png" class="btnaddanswer" /><img src="../images/deleteanswer.png" class="btndelanswer" /></td></tr>';
}
}
if (lsreplace) {
Expand Down Expand Up @@ -628,7 +628,7 @@ function quickaddlabels()

if (lsrows[0].indexOf("\t")==-1)
{
separatorchar=';'
separatorchar=';';
}
else
{
Expand All @@ -653,11 +653,11 @@ function quickaddlabels()
}
var escaped_value = thisrow[parseInt(x)+1].replace('"', '&quot;');
if (x==0) {
tablerows=tablerows+'<tr class="row_'+k+'" ><td><img class="handle" src="' + sImageURL + 'handle.png" /></td><td><input class="code" type="text" maxlength="5" size="5" value="'+thisrow[0]+'" /></td><td '+assessment_style+'><input class="assessment" type="'+assessment_type+'" maxlength="5" size="5" value="1"/></td><td><input type="text" size="100" class="answer" value="'+escaped_value+'"></input><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="' + sImageURL + 'addanswer.png" class="btnaddanswer" /><img src="' + sImageURL + 'deleteanswer.png" class="btndelanswer" /></td></tr>'
tablerows=tablerows+'<tr class="row_'+k+'" ><td><img class="handle" src="' + sImageURL + 'handle.png" /></td><td><input class="code" type="text" maxlength="5" size="5" value="'+thisrow[0]+'" /></td><td '+assessment_style+'><input class="assessment" type="'+assessment_type+'" maxlength="5" size="5" value="1"/></td><td><input type="text" size="100" class="answer" value="'+escaped_value+'"></input><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="' + sImageURL + 'addanswer.png" class="btnaddanswer" /><img src="' + sImageURL + 'deleteanswer.png" class="btndelanswer" /></td></tr>';
}
else
{
tablerows=tablerows+'<tr class="row_'+k+'" ><td>&nbsp;</td><td>&nbsp;</td><td><input type="text" size="100" class="answer" value="'+escaped_value+'"></input><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="' + sImageURL + 'addanswer.png" class="btnaddanswer" /><img src="' + sImageURL + 'deleteanswer.png" class="btndelanswer" /></td></tr>'
tablerows=tablerows+'<tr class="row_'+k+'" ><td>&nbsp;</td><td>&nbsp;</td><td><input type="text" size="100" class="answer" value="'+escaped_value+'"></input><a class="editorLink"><img class="btneditanswerena" src="' + sImageURL + 'edithtmlpopup.png" width="16" height="16" border="0" /><img class="btneditanswerdis" alt="Give focus to the HTML editor popup window" src="' + sImageURL + 'edithtmlpopup_disabled.png" style="display: none;" width="16" height="16" align="top" border="0" /></a></td><td><img src="' + sImageURL + 'addanswer.png" class="btnaddanswer" /><img src="' + sImageURL + 'deleteanswer.png" class="btndelanswer" /></td></tr>';

}
}
Expand Down Expand Up @@ -735,7 +735,7 @@ function savelabel()
{
ajaxreqsave();
}
})
});
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions scripts/admin/assessments.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ $(document).ready(function(){
}
}
}
)
);
$('#radiototal,#radiogroup').change();
$('.numbersonly').keypress(
function(e){
return jquery_goodchars(e,'1234567890-');
}
)
);
}
);

Expand Down
2 changes: 1 addition & 1 deletion scripts/admin/attributeControl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ $(document).ready(function() {
function checkboxFormatter(cellvalue, options) {
cellvalue = cellvalue + "";
var bchk = cellvalue.toLowerCase() == 'true' ? " checked=\"checked\"" : "";
return "<input type='checkbox' name='visible_"+options.rowId+"' id='visible_"+options.rowId+"' onclick=\"ajaxSave('" + options.rowId + "');\" " + bchk + " value='" + cellvalue + "' />"
return "<input type='checkbox' name='visible_"+options.rowId+"' id='visible_"+options.rowId+"' onclick=\"ajaxSave('" + options.rowId + "');\" " + bchk + " value='" + cellvalue + "' />";
}

function ajaxSave(rowid) {
Expand Down
6 changes: 3 additions & 3 deletions scripts/admin/attributeMap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $(document).ready(function(){
appendTo: 'body',
receive: function(event,ui) {
newcurrentarray = $(this).sortable('toArray');
var cpdbattpos = jQuery.inArray($(ui.item).attr('id'),newcurrentarray)
var cpdbattpos = jQuery.inArray($(ui.item).attr('id'),newcurrentarray);
cpdbattpos = cpdbattpos+1;
$('ul#cpdbatt > li:nth-child('+cpdbattpos+')').css("color", "black");
$('ul#cpdbatt > li:nth-child('+cpdbattpos+')').css("background-color","white");
Expand Down Expand Up @@ -120,11 +120,11 @@ $(document).ready(function(){
receive: function(event,ui) {
if($(ui.item).attr('id')[0]=='t')
{
alert(cannotAcceptTokenAttributesText)
alert(cannotAcceptTokenAttributesText);
$(ui.sender).sortable('cancel');
}
newcurrentarray = $(this).sortable('toArray');
var cpdbattpos = jQuery.inArray($(ui.item).attr('id'),newcurrentarray)
var cpdbattpos = jQuery.inArray($(ui.item).attr('id'),newcurrentarray);
cpdbattpos = cpdbattpos+1;
$('ul.newcreate > li:nth-child('+cpdbattpos+')').css("color", "white");
$('ul.newcreate > li:nth-child('+cpdbattpos+')').css("background-color","#696565");
Expand Down
4 changes: 2 additions & 2 deletions scripts/admin/browse.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ $(document).ready(function(){
}
}
else
alert(noFilesSelectedForDeletion)
alert(noFilesSelectedForDeletion);
});

// Download individual file bundle
Expand All @@ -85,7 +85,7 @@ $(document).ready(function(){
$('#resulttableform').submit();
}
else
alert(noFilesSelectedForDnld)
alert(noFilesSelectedForDnld);
});


Expand Down
6 changes: 3 additions & 3 deletions scripts/admin/conditions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ $(document).ready(function(){
}
}
}
)
);
$('#radiototal,#radiogroup').change();
$('.numbersonly').keypress(
function(e){
return jquery_goodchars(e,'1234567890-');
}
)
);
}

);
Expand Down Expand Up @@ -179,7 +179,7 @@ $(document).ready(function(){
$('#canswers option').remove();
selectTabFromOper();
$('#method').find('option').each( function() {
$(this).attr('disabled','')
$(this).attr('disabled','');
});

});
Expand Down
4 changes: 2 additions & 2 deletions scripts/admin/labels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function quickaddfunction(){
lsrows=$('#quickaddarea').val().split("\n");
var separatorchar="\t";
if (lsrows[0].indexOf("\t")==-1){
separatorchar=';'
separatorchar=';';
}


Expand Down Expand Up @@ -366,7 +366,7 @@ function code_duplicates_check()
sValue=$.trim($(this).val());
$(this).val(sValue);
codearray.push(sValue);
})
});
if ($.inArray('other', codearray)!=-1)
{
alert(otherisreserved);
Expand Down
2 changes: 1 addition & 1 deletion scripts/admin/listresponse.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $(window).scroll(function(){
firstload=true;
$(document).on("click","[data-delete]",function(event){
event.preventDefault();
var responseid=$(this).data("delete")
var responseid=$(this).data("delete");
var url=$(this).attr("href"); // Or replace responseid by post if needed
var buttons = {};
buttons[sDelCaption] = function(){
Expand Down

0 comments on commit 0052231

Please sign in to comment.