Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into 192_dev

  • Loading branch information...
commit 4c5495cb962c604ef3633b8970db6ddeba0ed07d 2 parents ebaaccc + 3c22b33
@TMSWhite authored
View
3  admin/scripts/subquestions.js
@@ -1,6 +1,9 @@
// $Id: subquestions.js 12442 2012-02-11 00:07:00Z shnoulle $
var labelcache=[];
$(document).ready(function(){
+ $("body").delegate(".code", "keyup", function() {
+ $(this).val($(this).val().replace(/[^a-zA-Z0-9_]/,''));
+ });
$('.tab-page:first .answertable tbody').sortable({ containment:'parent',
start:startmove,
update:aftermove,
View
4 classes/expressions/LimeExpressionManager.php
@@ -1217,8 +1217,8 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
// exclude_all_others_auto
// if (count(this.relevanceStatus) == count(this)) { set exclusive option value to "Y" and call checkconditions() }
// However, note that would need to blank the values, not use relevance, otherwise can't unclick the _auto option without having it re-enable itself
- if (isset($qattr['exclude_all_others_auto']) && trim($qattr['exclude_all_others_auto']) != ''
- && isset($qattr['exclude_all_others']) && count(explode(';',trim($qattr['exclude_all_others']))) == 1)
+ if (isset($qattr['exclude_all_others_auto']) && trim($qattr['exclude_all_others_auto']) == '1'
+ && isset($qattr['exclude_all_others']) && trim($qattr['exclude_all_others']) != '' && count(explode(';',trim($qattr['exclude_all_others']))) == 1)
{
$exclusive_option = trim($qattr['exclude_all_others']);
if ($hasSubqs) {
Please sign in to comment.
Something went wrong with that request. Please try again.