From f545daca26ba70ea8cf96af12809081613d571cc Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 1 Dec 2016 10:49:20 -0500 Subject: [PATCH 1/2] update recording text and orderable columns --- app/assets/javascripts/recordings.coffee | 4 ++-- config/locales/en-us.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index 54990f3a..a95eca27 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -29,13 +29,13 @@ class @Recordings info: false, order: [[ 0, "desc" ]], language: { - emptyTable: '

'+I18n.no_recordings+'

', + emptyTable: '

'+I18n.no_recordings_yet+'

', zeroRecords: '

'+I18n.no_recordings+'

' }, columns: [ { data: "start_time" }, { data: "previews", orderable: false }, - { data: "duration" }, + { data: "duration", orderable: false }, { data: "playbacks", orderable: false }, { data: "published", visible: false }, { data: "id", orderable: false } diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index 2bbfc2da..933d488b 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -44,6 +44,7 @@ en-US: meeting_ended: Meeting was ended meeting_started: Meeting was started no_recordings: No Recordings + no_recordings_yet: No Recordings (Yet!) publish_recording: Publish recording recording_deleted: Recording was deleted recording_published: Recording was published From 36c429d4bb0f2cb469444415783f662dd4df8350 Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 1 Dec 2016 11:14:10 -0500 Subject: [PATCH 2/2] remember name for logged out users --- app/assets/javascripts/landing.js | 4 ++++ app/assets/javascripts/meeting.coffee | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js index b2f9722e..ce201d3b 100644 --- a/app/assets/javascripts/landing.js +++ b/app/assets/javascripts/landing.js @@ -30,6 +30,10 @@ var init = function() { Meeting.clear(); + var nameInput = $('.meeting-user-name'); + if (!nameInput.val()) { + nameInput.val(localStorage.getItem('lastJoinedName')); + } // setup event handlers $('.center-panel-wrapper').on ('click', '.meeting-join', function (event) { diff --git a/app/assets/javascripts/meeting.coffee b/app/assets/javascripts/meeting.coffee index 9431e479..7364a5ea 100644 --- a/app/assets/javascripts/meeting.coffee +++ b/app/assets/javascripts/meeting.coffee @@ -58,6 +58,10 @@ class @Meeting getJoinMeetingResponse: -> return $.get @getURL() + "/join?name=" + @name, (data) => if data.messageKey == 'ok' && @type == 'meetings' + # update name used to join meeting + localStorage.setItem('lastJoinedName', @getName()) + + # update previously joined meetings on client try joinedMeetings = localStorage.getItem('joinedMeetings') || '' joinedMeetings = joinedMeetings.split(',')