change password form working

4 files changed, 19 insertions, 8 deletions

diff --git a/public/assets/js/lib/views/details/files.js b/public/assets/js/lib/views/details/files.js
index 00ca201..44c65c4 100644
--- a/public/assets/js/lib/views/details/files.js
+++ b/public/assets/js/lib/views/details/files.js
@@ -38,8 +38,10 @@ var FilesView = FormView.extend({
       audio.init()
     }
 
-    const sort = this.thread.settings.sort || "name_asc"
-    this.resort(sort)
+    if (this.thread) {
+      const sort = this.thread.settings.sort || "name_asc"
+      this.resort(sort)
+    }
   },
   
   files: [],
diff --git a/public/assets/js/lib/views/index/lastlog.js b/public/assets/js/lib/views/index/lastlog.js
index 02b3cca..7a738b7 100644
--- a/public/assets/js/lib/views/index/lastlog.js
+++ b/public/assets/js/lib/views/index/lastlog.js
@@ -29,7 +29,7 @@ var LastLog = View.extend({
   parse: function(user){
     if (Date.now()/1000 - user.lastseen > 86400 * 5 *10) return ''
     var t = this.template
-                .replace(/{{username}}/g, user.username)
+                .replace(/{{username}}/g, sanitize(user.username))
                 .replace(/{{age}}/g, get_age(user.lastseen) )
                 .replace(/{{age_class}}/g, carbon_date(user.lastseen) )
                 .trim()
diff --git a/public/assets/js/lib/views/index/threadbox.js b/public/assets/js/lib/views/index/threadbox.js
index e3a5193..34974b7 100644
--- a/public/assets/js/lib/views/index/threadbox.js
+++ b/public/assets/js/lib/views/index/threadbox.js
@@ -40,9 +40,18 @@ var ThreadBox = View.extend({
       })
       Object.keys(keywords).sort().forEach((keyword) => {
         this.appendKeyword({ keyword })
-        this.appendThreads(keywords[keyword].sort( (a,b) => {
-          return a.title.localeCompare(b.title) // b.lastmodified - a.lastmodified
-        }))
+        switch (data.sort) {
+          case 'date':
+            this.appendThreads(keywords[keyword].sort( (a,b) => {
+              return b.lastmodified - a.lastmodified
+            }))
+            break
+          default:
+            this.appendThreads(keywords[keyword].sort( (a,b) => {
+              return a.title.localeCompare(b.title)
+            }))
+            break
+        }
       })
     }
     if (is_mobile || window.innerWidth < 700) {
diff --git a/public/assets/js/lib/views/profile/profile.js b/public/assets/js/lib/views/profile/profile.js
index a738950..46ade8e 100644
--- a/public/assets/js/lib/views/profile/profile.js
+++ b/public/assets/js/lib/views/profile/profile.js
@@ -26,8 +26,8 @@ var ProfileView = View.extend({
     // this.comments.load(data.comments, data.thread)
     this.gallery.load(files)
     this.files.load(files)
-    this.files.resort("date", "asc")
-    this.threadbox.load({ threads, user })
+    this.files.resort("date_desc")
+    this.threadbox.load({ threads, user, sort: 'date' })
   },
 
   populate: function(user){