Преглед изворни кода

killed CollaberationManager R.I.P

Henry Oswald пре 12 година
родитељ
комит
33b6626fd9

+ 1 - 1
services/web/app/coffee/controllers/ProjectController.coffee

@@ -18,7 +18,7 @@ SubscriptionFormatters = require("../Features/Subscription/SubscriptionFormatter
 FileStoreHandler = require("../Features/FileStore/FileStoreHandler")
 
 module.exports = class ProjectController
-	constructor: (@collaberationManager)->
+	constructor: ()->
 		ProjectHandler = new ProjectHandler()
 
 	list: (req, res, next)->

+ 0 - 25
services/web/app/coffee/managers/CollaberationManager.coffee

@@ -1,25 +0,0 @@
-#this file is being slowly refactored out
-
-logger = require('logger-sharelatex')
-sanitize = require('sanitizer')
-projectHandler = require('../handlers/ProjectHandler')
-projectHandler = new projectHandler()
-SecurityManager = require('./SecurityManager')
-_ = require('underscore')
-projectEditorHandler = require('../Features/Project/ProjectEditorHandler')
-projectEntityHandler = require('../Features/Project/ProjectEntityHandler')
-versioningApiHandler = require('../Features/Versioning/VersioningApiHandler')
-metrics = require('../infrastructure/Metrics')
-EditorRealTimeController = require('../Features/Editor/EditorRealTimeController')
-
-module.exports = class CollaberationManager
-	constructor: (@io)->
-
-	distributMessage: (project_id, client, message)->
-		message = sanitize.escape(message)
-		metrics.inc "editor.instant-message"
-		client.get "first_name", (err, first_name)=>
-			EditorRealTimeController.emitToRoom project_id, 'reciveNewMessage', first_name, message
-
-	takeVersionSnapShot : (project_id, message, callback)->
-		versioningApiHandler.takeVersionSnapshot project_id, message, callback

+ 1 - 8
services/web/app/coffee/router.coffee

@@ -5,7 +5,6 @@ ProjectController = require("./controllers/ProjectController")
 ProjectApiController = require("./Features/Project/ProjectApiController")
 InfoController = require('./controllers/InfoController')
 SpellingController = require('./Features/Spelling/SpellingController')
-CollaberationManager = require('./managers/CollaberationManager')
 SecurityManager = require('./managers/SecurityManager')
 AuthorizationManager = require('./Features/Security/AuthorizationManager')
 versioningController =  require("./Features/Versioning/VersioningApiController")
@@ -46,9 +45,7 @@ module.exports = class Router
 	constructor: (app, io, socketSessions)->
 		app.use(app.router)
 
-		collaberationManager = new CollaberationManager(io)
-
-		Project = new ProjectController(collaberationManager)
+		Project = new ProjectController()
 		projectHandler = new ProjectHandler()
 
 		app.get  '/', HomeController.index
@@ -326,10 +323,6 @@ module.exports = class Router
 				AuthorizationManager.ensureClientCanViewProject client, (error, project_id) =>
 					CompileManager.getLogLines project_id, callback
 
-			client.on 'distributMessage', (message)->
-				AuthorizationManager.ensureClientCanViewProject client, (error, project_id) =>
-					collaberationManager.distributMessage project_id, client, message
-
 			client.on 'changeUsersPrivlageLevel', (user_id, newPrivalageLevel)->
 				AuthorizationManager.ensureClientCanAdminProject client, (error, project_id) =>
 					projectHandler.changeUsersPrivlageLevel project_id, user_id, newPrivalageLevel