浏览代码

more emoji css / removed facebook completely / diabled 'enter' key from chat

Akira Laine 9 年之前
父节点
当前提交
f6f8bd5599
共有 5 个文件被更改,包括 7 次插入20 次删除
  1. 0 1
      app/.meteor/packages
  2. 0 2
      app/.meteor/versions
  3. 6 6
      app/client/client.js
  4. 1 1
      app/client/emojidropdown.css
  5. 0 10
      app/server/server.js

+ 0 - 1
app/.meteor/packages

@@ -16,7 +16,6 @@ es5-shim                # ECMAScript 5 compatibility for older browsers.
 ecmascript              # Enable ECMAScript2015+ syntax in app code
 
 accounts-password
-accounts-facebook
 accounts-github
 service-configuration
 twbs:bootstrap

+ 0 - 2
app/.meteor/versions

@@ -1,5 +1,4 @@
 accounts-base@1.2.2
-accounts-facebook@1.0.6
 accounts-github@1.0.6
 accounts-oauth@1.1.8
 accounts-password@1.1.4
@@ -32,7 +31,6 @@ ejson@1.0.7
 email@1.0.8
 emojione:emojione@1.5.2
 es5-shim@4.1.14
-facebook@1.2.2
 fastclick@1.0.7
 geojson-utils@1.0.4
 github@1.1.4

+ 6 - 6
app/client/client.js

@@ -359,12 +359,12 @@ Template.room.events({
     "click #submit": function() {
         sendMessage();
     },
-    "keyup #chat-input": function(e) {
-        if (e.type == "keyup" && e.which == 13) {
-            e.preventDefault();
-            sendMessage()
-        }
-    },
+    //"keyup #chat-input": function(e) {
+    //    if (e.type === "keyup" && e.which === 13) {
+    //        e.preventDefault();
+    //        sendMessage()
+    //    }
+    //},
     "click #like": function(e) {
         $("#like").blur();
         Meteor.call("likeSong", Session.get("currentSong").mid);

+ 1 - 1
app/client/emojidropdown.css

@@ -11,7 +11,7 @@
     font-size: inherit;
     letter-spacing: .025em;
     box-shadow: 3px 3px 3px rgba(0,0,0,.2);
-    top: 425px !important;
+    top: 390px !important;
     height: 287px;
 }
 .dropdown-menu a:hover {

+ 0 - 10
app/server/server.js

@@ -366,16 +366,6 @@ Accounts.onCreateUser(function(options, user) {
     return user;
 });
 
-ServiceConfiguration.configurations.remove({
-    service: "facebook"
-});
-
-ServiceConfiguration.configurations.insert({
-    service: "facebook",
-    appId: "1496014310695890",
-    secret: "9a039f254a08a1488c08bb0737dbd2a6"
-});
-
 ServiceConfiguration.configurations.remove({
     service: "github"
 });