aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojciech Polak <polak@gnu.org>2014-02-09 17:57:17 +0100
committerWojciech Polak <polak@gnu.org>2014-02-09 17:57:17 +0100
commit4bfca38dd3eaf92a868390ac51ff85b54a6c2c90 (patch)
tree1e4793791204f5b9cf610d6ae8f5be61ccd2e61d
parenta5cc6e30ec0f31e64769c317b368f51d9d4ab808 (diff)
downloadcheetah-4bfca38dd3eaf92a868390ac51ff85b54a6c2c90.tar.gz
cheetah-4bfca38dd3eaf92a868390ac51ff85b54a6c2c90.tar.bz2
Fix notes list order.
-rw-r--r--frontend/xnotes.php9
-rw-r--r--js/v2/notes.js25
2 files changed, 18 insertions, 16 deletions
diff --git a/frontend/xnotes.php b/frontend/xnotes.php
index 5f2865d..7432666 100644
--- a/frontend/xnotes.php
+++ b/frontend/xnotes.php
@@ -4,3 +4,3 @@
Cheetah News xnotes.php
- Copyright (C) 2005, 2006, 2007 Wojciech Polak.
+ Copyright (C) 2005, 2006, 2007, 2014 Wojciech Polak.
@@ -124,5 +124,6 @@ function getNoteList ()
if ($end > 0) {
- echo "cheetahNoteList = {\n";
+ echo "cheetahNoteList = [\n";
while ($db->next_record ()) {
- echo " '".$db->f ('id')."' : ['".encodeJsEntities ($db->f ('color')).
+ echo "['".$db->f ('id').
+ "', '".encodeJsEntities ($db->f ('color')).
"', '".encodeJsEntities ($db->f ('title')).
@@ -134,3 +135,3 @@ function getNoteList ()
}
- echo "};\n";
+ echo "];\n";
}
diff --git a/js/v2/notes.js b/js/v2/notes.js
index 3fcf8a7..73f2b82 100644
--- a/js/v2/notes.js
+++ b/js/v2/notes.js
@@ -2,3 +2,3 @@
Cheetah News JS/v2 Notes
- Copyright (C) 2005, 2006, 2008 Wojciech Polak.
+ Copyright (C) 2005, 2006, 2008, 2014 Wojciech Polak.
@@ -257,6 +257,7 @@ Modules.Notes = new function () {
if (cheetahNoteList) {
- for (var n in cheetahNoteList) {
+ for (var n = 0; n < cheetahNoteList.length; n++) {
- var row_rem = DCE ('span', {id: 'noteRowRem_' + n},
- ['<span class="link" id="removeNote_' + n +
+ var noteId = cheetahNoteList[n][0];
+ var row_rem = DCE ('span', {id: 'noteRowRem_' + noteId},
+ ['<span class="link" id="removeNote_' + noteId +
'"action="rem"><img class="img-10-remove iremove" src="images/t.gif" width="10" height="10" alt="'
@@ -266,4 +267,4 @@ Modules.Notes = new function () {
- var row_pstatus = DCE ('span', {id: 'notePStatus' + n},
- [cheetahNoteList[n][3] == 'yes' ?
+ var row_pstatus = DCE ('span', {id: 'notePStatus' + noteId},
+ [cheetahNoteList[n][4] == 'yes' ?
'<img class="img-16-world" src="images/t.gif" width="16" height="16" alt="P" title="'
@@ -273,9 +274,9 @@ Modules.Notes = new function () {
- var tags = '<span class="nb_tags">' + cheetahNoteList[n][4].replace (/,/g, ', ') + '</span>';
+ var tags = '<span class="nb_tags">' + cheetahNoteList[n][5].replace (/,/g, ', ') + '</span>';
- var row = DCE ('div', {id: 'note_' + n, className: 'nbRow pointer'},
+ var row = DCE ('div', {id: 'note_' + noteId, className: 'nbRow pointer'},
[DCE ('div', {className: 'nb_tls'},
- [cheetahNoteList[n][1] + ' ' + tags,
+ [cheetahNoteList[n][2] + ' ' + tags,
DCE ('div', {className: 'nb_tld'},
- [cheetahNoteList[n][2].substr (0, 16),
+ [cheetahNoteList[n][3].substr (0, 16),
row_pstatus,
@@ -284,3 +285,3 @@ Modules.Notes = new function () {
- row.setAttribute ('noteid', n);
+ row.setAttribute ('noteid', noteId);
row.onclick = openINote;
@@ -289,3 +290,3 @@ Modules.Notes = new function () {
- var rem = GID ('removeNote_' + n);
+ var rem = GID ('removeNote_' + noteId);
if (rem) {

Return to:

Send suggestions and report system problems to the System administrator.