From 7d7be6224736fbbb879ba7553b6f8be378ebfd62 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Mon, 14 Sep 2015 14:42:16 -0300 Subject: [PATCH] renaming package external to livechat --- .meteor/packages | 2 +- .meteor/versions | 1 + .travis.yml | 4 +-- build.sh | 10 ------- .../app/client/lib/chatMessages.coffee | 2 +- .../client/methods/sendMessageExternal.coffee | 2 +- .../app/client/routes/router.coffee | 2 +- .../app/client/startup/visitor.coffee | 6 ++--- .../app/client/stylesheets/main.less | 4 +-- .../app/client/views/room.html | 2 +- .../{external.coffee => livechat.coffee} | 6 ++--- packages/rocketchat-external/methods.coffee | 4 +-- packages/rocketchat-external/package.js | 16 ++++++------ .../plugin/build-external.js | 4 +-- packages/rocketchat-external/plugin/build.sh | 14 +++++----- .../rocketchat-external/rocket-external.js | 4 +-- .../rocketchat-lib/server/sendMessage.coffee | 26 +++++++++++++++++++ server/methods/createDirectMessage.coffee | 15 ----------- 18 files changed, 63 insertions(+), 61 deletions(-) delete mode 100755 build.sh rename packages/rocketchat-external/{external.coffee => livechat.coffee} (75%) diff --git a/.meteor/packages b/.meteor/packages index 210eea390ff..a3f81d30a95 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -42,7 +42,7 @@ rocketchat:slashcommands-join rocketchat:slashcommands-leave rocketchat:statistics rocketchat:webrtc -#rocketchat:external +rocketchat:livechat #rocketchat:hubot #rocketchat:irc diff --git a/.meteor/versions b/.meteor/versions index b09ffefd8ab..fc834a162e6 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -104,6 +104,7 @@ rocketchat:autolinker@0.0.1 rocketchat:colors@0.0.1 rocketchat:custom-oauth@1.0.0 rocketchat:emojione@0.0.1 +rocketchat:livechat@0.0.1 rocketchat:favico@0.0.1 rocketchat:file@0.0.1 rocketchat:gitlab@0.0.1 diff --git a/.travis.yml b/.travis.yml index f51f1ee5888..c518b60636b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,6 @@ before_install: - "curl https://install.meteor.com | /bin/sh" script: - - meteor add rocketchat:external + - meteor add rocketchat:livechat - meteor add rocketchat:hubot - - meteor build --server demo.rocket.chat ./ \ No newline at end of file + - meteor build --server demo.rocket.chat ./ diff --git a/build.sh b/build.sh deleted file mode 100755 index a3eef8615c5..00000000000 --- a/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -source ./build-info.sh -export METEOR_SETTINGS=$(cat settings.json) -meteor add rocketchat:external -meteor add rocketchat:hubot -meteor build --server https://demo.rocket.chat --directory /var/www/rocket.chat -cd /var/www/rocket.chat/bundle/programs/server -npm install -cd /var/www/rocket.chat/current -pm2 startOrRestart /var/www/rocket.chat/current/pm2.json diff --git a/packages/rocketchat-external/app/client/lib/chatMessages.coffee b/packages/rocketchat-external/app/client/lib/chatMessages.coffee index 02b1b34c165..2f3b198b310 100644 --- a/packages/rocketchat-external/app/client/lib/chatMessages.coffee +++ b/packages/rocketchat-external/app/client/lib/chatMessages.coffee @@ -87,7 +87,7 @@ class @ChatMessages else #Run to allow local encryption # Meteor.call 'onClientBeforeSendMessage', {} - Meteor.call 'sendMessageExternal', msgObject, (error, result) -> + Meteor.call 'sendMessageLivechat', msgObject, (error, result) -> if error ChatMessage.update msgObject._id, { $set: { error: true } } showError error.reason diff --git a/packages/rocketchat-external/app/client/methods/sendMessageExternal.coffee b/packages/rocketchat-external/app/client/methods/sendMessageExternal.coffee index 9b71ba76392..adf26aef735 100644 --- a/packages/rocketchat-external/app/client/methods/sendMessageExternal.coffee +++ b/packages/rocketchat-external/app/client/methods/sendMessageExternal.coffee @@ -1,5 +1,5 @@ Meteor.methods - sendMessageExternal: (message) -> + sendMessageLivechat: (message) -> if s.trim(message.msg) isnt '' message.ts = new Date(Date.now() + TimeSync.serverOffset()) diff --git a/packages/rocketchat-external/app/client/routes/router.coffee b/packages/rocketchat-external/app/client/routes/router.coffee index fb19df7debc..976443f1c31 100644 --- a/packages/rocketchat-external/app/client/routes/router.coffee +++ b/packages/rocketchat-external/app/client/routes/router.coffee @@ -1,4 +1,4 @@ -FlowRouter.route '/external', +FlowRouter.route '/livechat', name: 'index' triggersEnter: [ diff --git a/packages/rocketchat-external/app/client/startup/visitor.coffee b/packages/rocketchat-external/app/client/startup/visitor.coffee index f2ecf6770dd..cb03f35f80d 100644 --- a/packages/rocketchat-external/app/client/startup/visitor.coffee +++ b/packages/rocketchat-external/app/client/startup/visitor.coffee @@ -1,7 +1,7 @@ @visitorId = new ReactiveVar null Meteor.startup -> - if not localStorage.getItem('rocketChatExternal')? - localStorage.setItem('rocketChatExternal', Random.id()) + if not localStorage.getItem('rocketChatLivechat')? + localStorage.setItem('rocketChatLivechat', Random.id()) - visitorId.set localStorage.getItem('rocketChatExternal') + visitorId.set localStorage.getItem('rocketChatLivechat') diff --git a/packages/rocketchat-external/app/client/stylesheets/main.less b/packages/rocketchat-external/app/client/stylesheets/main.less index 847b7a51764..22398ff6c29 100644 --- a/packages/rocketchat-external/app/client/stylesheets/main.less +++ b/packages/rocketchat-external/app/client/stylesheets/main.less @@ -40,7 +40,7 @@ input:focus { box-shadow: 0 0 0; } -.external-room { +.livechat-room { position: fixed; top: 0; bottom: 0; @@ -321,7 +321,7 @@ input:focus { } @media all and(max-height: 200px) { - .external-room { + .livechat-room { .title { height: 100%; } diff --git a/packages/rocketchat-external/app/client/views/room.html b/packages/rocketchat-external/app/client/views/room.html index 5aa84363c32..89b8dfc09e6 100644 --- a/packages/rocketchat-external/app/client/views/room.html +++ b/packages/rocketchat-external/app/client/views/room.html @@ -1,5 +1,5 @@