From 31ca34fbfeb4921a3b8c1c96e1762eb9ec818db5 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 27 Mar 2017 16:47:10 -0300 Subject: [PATCH 1/2] rocketchat-ui coffee to js part1 --- .../client/views/404/roomNotFound.coffee | 6 ---- .../client/views/404/roomNotFound.js | 8 +++++ .../client/views/app/burger.coffee | 5 ---- .../rocketchat-ui/client/views/app/burger.js | 10 +++++++ .../client/views/app/home.coffee | 5 ---- .../rocketchat-ui/client/views/app/home.js | 8 +++++ .../client/views/app/roomSearch.coffee | 10 ------- .../client/views/app/roomSearch.js | 15 ++++++++++ .../client/views/app/secretURL.coffee | 23 --------------- .../client/views/app/secretURL.js | 29 +++++++++++++++++++ .../rocketchat-ui/client/views/cmsPage.coffee | 16 ---------- .../rocketchat-ui/client/views/cmsPage.js | 26 +++++++++++++++++ .../rocketchat-ui/client/views/fxos.coffee | 20 ------------- packages/rocketchat-ui/client/views/fxos.js | 19 ++++++++++++ .../rocketchat-ui/client/views/modal.coffee | 1 - packages/rocketchat-ui/client/views/modal.js | 1 + packages/rocketchat-ui/package.js | 16 +++++----- 17 files changed, 124 insertions(+), 94 deletions(-) delete mode 100644 packages/rocketchat-ui/client/views/404/roomNotFound.coffee create mode 100644 packages/rocketchat-ui/client/views/404/roomNotFound.js delete mode 100644 packages/rocketchat-ui/client/views/app/burger.coffee create mode 100644 packages/rocketchat-ui/client/views/app/burger.js delete mode 100644 packages/rocketchat-ui/client/views/app/home.coffee create mode 100644 packages/rocketchat-ui/client/views/app/home.js delete mode 100644 packages/rocketchat-ui/client/views/app/roomSearch.coffee create mode 100644 packages/rocketchat-ui/client/views/app/roomSearch.js delete mode 100644 packages/rocketchat-ui/client/views/app/secretURL.coffee create mode 100644 packages/rocketchat-ui/client/views/app/secretURL.js delete mode 100644 packages/rocketchat-ui/client/views/cmsPage.coffee create mode 100644 packages/rocketchat-ui/client/views/cmsPage.js delete mode 100644 packages/rocketchat-ui/client/views/fxos.coffee create mode 100644 packages/rocketchat-ui/client/views/fxos.js delete mode 100644 packages/rocketchat-ui/client/views/modal.coffee create mode 100644 packages/rocketchat-ui/client/views/modal.js diff --git a/packages/rocketchat-ui/client/views/404/roomNotFound.coffee b/packages/rocketchat-ui/client/views/404/roomNotFound.coffee deleted file mode 100644 index 6720b0228ef3..000000000000 --- a/packages/rocketchat-ui/client/views/404/roomNotFound.coffee +++ /dev/null @@ -1,6 +0,0 @@ -Template.roomNotFound.helpers - data: -> - return Session.get 'roomNotFound' - - name: -> - return Blaze._escape(this.name) diff --git a/packages/rocketchat-ui/client/views/404/roomNotFound.js b/packages/rocketchat-ui/client/views/404/roomNotFound.js new file mode 100644 index 000000000000..c09dc1f0190b --- /dev/null +++ b/packages/rocketchat-ui/client/views/404/roomNotFound.js @@ -0,0 +1,8 @@ +Template.roomNotFound.helpers({ + data() { + return Session.get('roomNotFound'); + }, + name() { + return Blaze._escape(this.name); + } +}); diff --git a/packages/rocketchat-ui/client/views/app/burger.coffee b/packages/rocketchat-ui/client/views/app/burger.coffee deleted file mode 100644 index 58ca516db882..000000000000 --- a/packages/rocketchat-ui/client/views/app/burger.coffee +++ /dev/null @@ -1,5 +0,0 @@ -Template.burger.helpers - unread: -> - return Session.get 'unread' - isMenuOpen: -> - if Session.equals('isMenuOpen', true) then 'menu-opened' diff --git a/packages/rocketchat-ui/client/views/app/burger.js b/packages/rocketchat-ui/client/views/app/burger.js new file mode 100644 index 000000000000..07df5c0e1ca3 --- /dev/null +++ b/packages/rocketchat-ui/client/views/app/burger.js @@ -0,0 +1,10 @@ +Template.burger.helpers({ + unread() { + return Session.get('unread'); + }, + isMenuOpen() { + if (Session.equals('isMenuOpen', true)) { + return 'menu-opened'; + } + } +}); diff --git a/packages/rocketchat-ui/client/views/app/home.coffee b/packages/rocketchat-ui/client/views/app/home.coffee deleted file mode 100644 index f30686843529..000000000000 --- a/packages/rocketchat-ui/client/views/app/home.coffee +++ /dev/null @@ -1,5 +0,0 @@ -Template.home.helpers - title: -> - return RocketChat.settings.get 'Layout_Home_Title' - body: -> - return RocketChat.settings.get 'Layout_Home_Body' diff --git a/packages/rocketchat-ui/client/views/app/home.js b/packages/rocketchat-ui/client/views/app/home.js new file mode 100644 index 000000000000..fd66695d3785 --- /dev/null +++ b/packages/rocketchat-ui/client/views/app/home.js @@ -0,0 +1,8 @@ +Template.home.helpers({ + title() { + return RocketChat.settings.get('Layout_Home_Title'); + }, + body() { + return RocketChat.settings.get('Layout_Home_Body'); + } +}); diff --git a/packages/rocketchat-ui/client/views/app/roomSearch.coffee b/packages/rocketchat-ui/client/views/app/roomSearch.coffee deleted file mode 100644 index 5e8800500850..000000000000 --- a/packages/rocketchat-ui/client/views/app/roomSearch.coffee +++ /dev/null @@ -1,10 +0,0 @@ -Template.roomSearch.helpers - roomIcon: -> - return 'icon-at' if this.type is 'u' - - if this.type is 'r' - return RocketChat.roomTypes.getIcon this.t - - userStatus: -> - if this.type is 'u' - return 'status-' + this.status diff --git a/packages/rocketchat-ui/client/views/app/roomSearch.js b/packages/rocketchat-ui/client/views/app/roomSearch.js new file mode 100644 index 000000000000..82838cf8e510 --- /dev/null +++ b/packages/rocketchat-ui/client/views/app/roomSearch.js @@ -0,0 +1,15 @@ +Template.roomSearch.helpers({ + roomIcon() { + if (this.type === 'u') { + return 'icon-at'; + } + if (this.type === 'r') { + return RocketChat.roomTypes.getIcon(this.t); + } + }, + userStatus() { + if (this.type === 'u') { + return `status-${ this.status }`; + } + } +}); diff --git a/packages/rocketchat-ui/client/views/app/secretURL.coffee b/packages/rocketchat-ui/client/views/app/secretURL.coffee deleted file mode 100644 index 0df4ed072812..000000000000 --- a/packages/rocketchat-ui/client/views/app/secretURL.coffee +++ /dev/null @@ -1,23 +0,0 @@ -Template.secretURL.helpers - registrationAllowed: -> - return RocketChat.settings.get('Accounts_RegistrationForm') is 'Secret URL' and Template.instance().hashIsValid?.get() - - ready: -> - return Template.instance().subscriptionsReady?() and Template.instance().hashReady?.get() - - -Template.secretURL.onCreated -> - @hashIsValid = new ReactiveVar false - @hashReady = new ReactiveVar false - - Meteor.call 'checkRegistrationSecretURL', FlowRouter.getParam('hash'), (err, success) => - @hashReady.set true - if success - Session.set 'loginDefaultState', 'register' - KonchatNotification.getDesktopPermission() - @hashIsValid.set true - else - @hashIsValid.set false - -Template.secretURL.onRendered -> - $('#initial-page-loading').remove() diff --git a/packages/rocketchat-ui/client/views/app/secretURL.js b/packages/rocketchat-ui/client/views/app/secretURL.js new file mode 100644 index 000000000000..84d689d8caec --- /dev/null +++ b/packages/rocketchat-ui/client/views/app/secretURL.js @@ -0,0 +1,29 @@ +/* globals KonchatNotification */ +Template.secretURL.helpers({ + registrationAllowed() { + const {hashIsValid} = Template.instance(); + return RocketChat.settings.get('Accounts_RegistrationForm') === 'Secret URL' && hashIsValid && hashIsValid.get(); + }, + ready() { + const {subscriptionsReady, hashReady} = Template.instance(); + return typeof subscriptionsReady === 'function' && subscriptionsReady() && hashReady && hashReady.get(); + } +}); + +Template.secretURL.onCreated(function() { + this.hashIsValid = new ReactiveVar(false); + this.hashReady = new ReactiveVar(false); + Meteor.call('checkRegistrationSecretURL', FlowRouter.getParam('hash'), (err, success) => { + this.hashReady.set(true); + if (success) { + Session.set('loginDefaultState', 'register'); + KonchatNotification.getDesktopPermission(); + return this.hashIsValid.set(true); + } + return this.hashIsValid.set(false); + }); +}); + +Template.secretURL.onRendered(function() { + return $('#initial-page-loading').remove(); +}); diff --git a/packages/rocketchat-ui/client/views/cmsPage.coffee b/packages/rocketchat-ui/client/views/cmsPage.coffee deleted file mode 100644 index dda84a787d84..000000000000 --- a/packages/rocketchat-ui/client/views/cmsPage.coffee +++ /dev/null @@ -1,16 +0,0 @@ -Template.cmsPage.onCreated -> - @page = new ReactiveVar '' - Meteor.autorun => - if Session.get('cmsPage')? - @page.set RocketChat.settings.get Session.get('cmsPage') - -Template.cmsPage.helpers - page: -> - return Template.instance().page.get() - -Template.cmsPage.events - 'click .cms-page-close': -> - FlowRouter.go('/') - -Template.cmsPage.onRendered -> - $('#initial-page-loading').remove() diff --git a/packages/rocketchat-ui/client/views/cmsPage.js b/packages/rocketchat-ui/client/views/cmsPage.js new file mode 100644 index 000000000000..9008c8613f96 --- /dev/null +++ b/packages/rocketchat-ui/client/views/cmsPage.js @@ -0,0 +1,26 @@ +Template.cmsPage.onCreated(function() { + this.page = new ReactiveVar(''); + return Meteor.autorun((function(_this) { + return function() { + if (Session.get('cmsPage') != null) { + return _this.page.set(RocketChat.settings.get(Session.get('cmsPage'))); + } + }; + })(this)); +}); + +Template.cmsPage.helpers({ + page() { + return Template.instance().page.get(); + } +}); + +Template.cmsPage.events({ + 'click .cms-page-close'() { + return FlowRouter.go('/'); + } +}); + +Template.cmsPage.onRendered(function() { + return $('#initial-page-loading').remove(); +}); diff --git a/packages/rocketchat-ui/client/views/fxos.coffee b/packages/rocketchat-ui/client/views/fxos.coffee deleted file mode 100644 index dc0778d7a5f0..000000000000 --- a/packages/rocketchat-ui/client/views/fxos.coffee +++ /dev/null @@ -1,20 +0,0 @@ -Template.fxOsInstallPrompt.onRendered -> - showPrompt = () -> - request = window.navigator.mozApps.install 'http://' + location.host + '/manifest.webapp' - request.onsuccess = () -> - # Save the App object that is returned - appRecord = this.result - BlazeLayout.render 'fxOsInstallDone' - - request.onerror = () -> - # Display the error information from the DOMError object - BlazeLayout.render 'fxOsInstallError', {installError: this.error.name} - - setTimeout(showPrompt, 2000); - $('#initial-page-loading').remove() - -Template.fxOsInstallDone.onRendered -> - $('#initial-page-loading').remove() - -Template.fxOsInstallError.onRendered -> - $('#initial-page-loading').remove() diff --git a/packages/rocketchat-ui/client/views/fxos.js b/packages/rocketchat-ui/client/views/fxos.js new file mode 100644 index 000000000000..990339f7015f --- /dev/null +++ b/packages/rocketchat-ui/client/views/fxos.js @@ -0,0 +1,19 @@ +Template.fxOsInstallPrompt.onRendered(function() { + + const showPrompt = function() { + const request = window.navigator.mozApps.install(`http://${ location.host }/manifest.webapp`); + request.onsuccess = function() { + BlazeLayout.render('fxOsInstallDone'); + }; + request.onerror = function() { + BlazeLayout.render('fxOsInstallError', { + installError: this.error.name + }); + }; + }; + setTimeout(showPrompt, 2000); + return $('#initial-page-loading').remove(); +}); + +Template.fxOsInstallDone.onRendered(() => $('#initial-page-loading').remove()); +Template.fxOsInstallError.onRendered(() => $('#initial-page-loading').remove()); diff --git a/packages/rocketchat-ui/client/views/modal.coffee b/packages/rocketchat-ui/client/views/modal.coffee deleted file mode 100644 index fa1807d3392d..000000000000 --- a/packages/rocketchat-ui/client/views/modal.coffee +++ /dev/null @@ -1 +0,0 @@ -Template.modal.rendered = -> diff --git a/packages/rocketchat-ui/client/views/modal.js b/packages/rocketchat-ui/client/views/modal.js new file mode 100644 index 000000000000..a13b6eeb7622 --- /dev/null +++ b/packages/rocketchat-ui/client/views/modal.js @@ -0,0 +1 @@ +Template.modal.rendered = function() {}; diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js index f39733703836..7ee88b43255d 100644 --- a/packages/rocketchat-ui/package.js +++ b/packages/rocketchat-ui/package.js @@ -94,17 +94,17 @@ Package.onUse(function(api) { api.addFiles('client/views/app/videoCall/videoCall.html', 'client'); api.addFiles('client/views/app/photoswipe.html', 'client'); - api.addFiles('client/views/cmsPage.coffee', 'client'); - api.addFiles('client/views/fxos.coffee', 'client'); - api.addFiles('client/views/modal.coffee', 'client'); - api.addFiles('client/views/404/roomNotFound.coffee', 'client'); - api.addFiles('client/views/app/burger.coffee', 'client'); - api.addFiles('client/views/app/home.coffee', 'client'); + api.addFiles('client/views/cmsPage.js', 'client'); + api.addFiles('client/views/fxos.js', 'client'); + api.addFiles('client/views/modal.js', 'client'); + api.addFiles('client/views/404/roomNotFound.js', 'client'); + api.addFiles('client/views/app/burger.js', 'client'); + api.addFiles('client/views/app/home.js', 'client'); api.addFiles('client/views/app/mobileMessageMenu.js', 'client'); api.addFiles('client/views/app/privateHistory.coffee', 'client'); api.addFiles('client/views/app/room.coffee', 'client'); - api.addFiles('client/views/app/roomSearch.coffee', 'client'); - api.addFiles('client/views/app/secretURL.coffee', 'client'); + api.addFiles('client/views/app/roomSearch.js', 'client'); + api.addFiles('client/views/app/secretURL.js', 'client'); api.addFiles('client/views/app/videoCall/videoButtons.coffee', 'client'); api.addFiles('client/views/app/videoCall/videoCall.coffee', 'client'); api.addFiles('client/views/app/photoswipe.js', 'client'); From 66268d4348a5070daaf044de57fd19789b363738 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 28 Mar 2017 17:53:51 -0300 Subject: [PATCH 2/2] fix --- packages/rocketchat-ui/client/views/cmsPage.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/rocketchat-ui/client/views/cmsPage.js b/packages/rocketchat-ui/client/views/cmsPage.js index 9008c8613f96..33cfe9e32414 100644 --- a/packages/rocketchat-ui/client/views/cmsPage.js +++ b/packages/rocketchat-ui/client/views/cmsPage.js @@ -1,12 +1,11 @@ Template.cmsPage.onCreated(function() { this.page = new ReactiveVar(''); - return Meteor.autorun((function(_this) { - return function() { - if (Session.get('cmsPage') != null) { - return _this.page.set(RocketChat.settings.get(Session.get('cmsPage'))); - } - }; - })(this)); + return Meteor.autorun(() => { + const cmsPage = Session.get('cmsPage'); + if (cmsPage != null) { + return this.page.set(RocketChat.settings.get(cmsPage)); + } + }); }); Template.cmsPage.helpers({