Browse Source

Use camelCase variable.

pull/183/head
Simon Eisenmann 11 years ago
parent
commit
ed5a3d7fb7
  1. 8
      static/js/directives/chat.js

8
static/js/directives/chat.js

@ -25,7 +25,7 @@ define(['jquery', 'underscore', 'text!partials/chat.html', 'text!partials/chatro
return ["$compile", "safeDisplayName", "mediaStream", "safeApply", "desktopNotify", "translation", "playSound", "fileUpload", "randomGen", "buddyData", "appData", "$timeout", "geolocation", function($compile, safeDisplayName, mediaStream, safeApply, desktopNotify, translation, playSound, fileUpload, randomGen, buddyData, appData, $timeout, geolocation) { return ["$compile", "safeDisplayName", "mediaStream", "safeApply", "desktopNotify", "translation", "playSound", "fileUpload", "randomGen", "buddyData", "appData", "$timeout", "geolocation", function($compile, safeDisplayName, mediaStream, safeApply, desktopNotify, translation, playSound, fileUpload, randomGen, buddyData, appData, $timeout, geolocation) {
var displayName = safeDisplayName; var displayName = safeDisplayName;
var group_chat_id = ""; var groupChatId = "";
var controller = ['$scope', '$element', '$attrs', function($scope, $element, $attrs) { var controller = ['$scope', '$element', '$attrs', function($scope, $element, $attrs) {
@ -35,7 +35,7 @@ define(['jquery', 'underscore', 'text!partials/chat.html', 'text!partials/chatro
var ctrl = this; var ctrl = this;
var rooms = ctrl.rooms = {}; var rooms = ctrl.rooms = {};
ctrl.visibleRooms = []; ctrl.visibleRooms = [];
ctrl.group = group_chat_id; ctrl.group = groupChatId;
ctrl.get = function(id) { ctrl.get = function(id) {
return ctrl.rooms[id]; return ctrl.rooms[id];
} }
@ -133,7 +133,7 @@ define(['jquery', 'underscore', 'text!partials/chat.html', 'text!partials/chatro
$scope.$parent.$on("startchat", function(event, id, options) { $scope.$parent.$on("startchat", function(event, id, options) {
//console.log("startchat requested", event, id); //console.log("startchat requested", event, id);
if (id === group_chat_id) { if (id === groupChatId) {
$scope.showGroupRoom(null, options); $scope.showGroupRoom(null, options);
} else { } else {
$scope.showRoom(id, { $scope.showRoom(id, {
@ -145,7 +145,7 @@ define(['jquery', 'underscore', 'text!partials/chat.html', 'text!partials/chatro
$scope.$parent.$on("requestcontact", function(event, id, options) { $scope.$parent.$on("requestcontact", function(event, id, options) {
if (id !== group_chat_id) { if (id !== groupChatId) {
// Make sure the contact id is valid. // Make sure the contact id is valid.
var ad = appData.get(); var ad = appData.get();
if (!ad.userid) { if (!ad.userid) {

Loading…
Cancel
Save