Skip to content

Commit

Permalink
Revert "fixes"
Browse files Browse the repository at this point in the history
This reverts commit 82fb1b4.
  • Loading branch information
Rix authored and Rix committed Oct 7, 2012
1 parent 82fb1b4 commit 4273ea2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion client/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ div.notice.general{
margin-bottom: 10px;
}

div.notice.common{
div.notice.general.common{
border-color:rgba(145, 255, 5, 0.5);
background-color:rgba(18, 150, 0, 0.6);
color:#AAFF83;
Expand Down
8 changes: 4 additions & 4 deletions client/js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ $(document)

// Match with the notice table and handel the notice messages
function notice_handler(notice_key, target) {
notice_key = (typeof notice_key == 'undefined' || notice_key == '' || notice_key == null || typeof notice_table[notice_key] == 'undefined') ? 'unknown_error' : notice_key;
notice_key = (typeof notice_key == 'undefined') ? 'unknown_error' : notice_key;
target = (typeof target == 'undefined') ? '' : target;
if(target != '') {
add_card_notice(target, notice_table[notice_key].message, notice_table[notice_key].style, notice_table[notice_key].delay);
Expand Down Expand Up @@ -372,7 +372,7 @@ function book_meal_start() {
}
}

if((forum_uid < 1) && (typeof card_psw == 'undefined' || card_psw == '' || card_psw == null)) {
if((forum_uid < 1) && (typeof card_psw == 'undefined' && card_psw != '' && card_psw != null)) {
notice_handler('no_password', card_no);
} else {
card_e(card_no, 'btn')
Expand Down Expand Up @@ -414,7 +414,7 @@ function book_meal_start() {
function card_e(card_no, target) {
var table = $(card_table);
target = (typeof target == 'undefined') ? '' : target;
e_card_no_input = table.find('input[value=' + card_no + ']:first');
e_card_no_input = table.find('input[value="' + card_no + '"]:first');
switch(target) {
case 'tr':
return e_card_no_input.closest('tr');
Expand All @@ -429,7 +429,7 @@ function card_e(card_no, target) {
break;
case 'btn':
return e_card_no_input.closest('tr')
.find('a[name=card_btn]:first');
.find('a[name="card_btn"]:first');
break;
}
return e_card_no_input;
Expand Down

0 comments on commit 4273ea2

Please sign in to comment.