From 67f5270bfc158a04dbf2785daba1de9ee4621107 Mon Sep 17 00:00:00 2001 From: Shrihari Date: Mon, 24 Mar 2014 12:23:41 +0530 Subject: [PATCH] Migrate .on, .once - Batch 1 --- app/lib/auth.coffee | 2 +- app/views/account/profile_view.coffee | 8 ++++---- app/views/account/settings_view.coffee | 6 +++--- app/views/admin/level_sessions_view.coffee | 2 +- app/views/admin/users_view.coffee | 2 +- app/views/editor/article/edit.coffee | 8 ++++---- app/views/kinds/SearchView.coffee | 5 ++--- app/views/modal/versions_modal.coffee | 8 ++++---- app/views/play/level/playback_view.coffee | 6 ++---- app/views/play/level_view.coffee | 16 ++++++---------- app/views/play/spectate_view.coffee | 12 ++++-------- 11 files changed, 32 insertions(+), 43 deletions(-) diff --git a/app/lib/auth.coffee b/app/lib/auth.coffee index df2b2b6c3..dfe736107 100644 --- a/app/lib/auth.coffee +++ b/app/lib/auth.coffee @@ -58,7 +58,7 @@ init = -> storage.save(CURRENT_USER_KEY, me.attributes) me.loadGravatarProfile() if me.get('email') - me.on('sync', userSynced) + @listenTo(me, 'sync', userSynced) userSynced = (user) -> Backbone.Mediator.publish('me:synced', {me:user}) diff --git a/app/views/account/profile_view.coffee b/app/views/account/profile_view.coffee index 4184a0787..32faec138 100644 --- a/app/views/account/profile_view.coffee +++ b/app/views/account/profile_view.coffee @@ -11,14 +11,14 @@ module.exports = class ProfileView extends View super options @user = User.getByID(@userID) @loading = false if 'gravatarProfile' of @user - @user.on('change', @userChanged) - @user.on('error', @userError) + @listenTo(@user, 'change', @userChanged) + @listenTo(@user, 'error', @userError) - userChanged: (user) => + userChanged: (user) -> @loading = false if 'gravatarProfile' of user @render() - userError: (user) => + userError: (user) -> @loading = false @render() diff --git a/app/views/account/settings_view.coffee b/app/views/account/settings_view.coffee index 27edf27e1..8357af325 100644 --- a/app/views/account/settings_view.coffee +++ b/app/views/account/settings_view.coffee @@ -19,11 +19,11 @@ module.exports = class SettingsView extends View @save = _.debounce(@save, 200) super options return unless me - me.on('change', @refreshPicturePane) # depends on gravatar load - me.on('invalid', (errors) -> forms.applyErrorsToForm(@$el, me.validationError)) + @listenTo(me, 'change', @refreshPicturePane) # depends on gravatar load + @listenTo(me, 'invalid', (errors) -> forms.applyErrorsToForm(@$el, me.validationError)) window.f = @getSubscriptions - refreshPicturePane: => + refreshPicturePane: -> h = $(@template(@getRenderData())) newPane = $('#picture-pane', h) oldPane = $('#picture-pane') diff --git a/app/views/admin/level_sessions_view.coffee b/app/views/admin/level_sessions_view.coffee index 6685db37a..e66fefc2f 100644 --- a/app/views/admin/level_sessions_view.coffee +++ b/app/views/admin/level_sessions_view.coffee @@ -18,7 +18,7 @@ module.exports = class LevelSessionsView extends View getLevelSessions: -> @sessions = new LevelSessionCollection @sessions.fetch() - @sessions.on('all', @render) + @listenTo(@sessions, 'all', @render) getRenderData: => c = super() diff --git a/app/views/admin/users_view.coffee b/app/views/admin/users_view.coffee index c6c175583..c19c7bd37 100644 --- a/app/views/admin/users_view.coffee +++ b/app/views/admin/users_view.coffee @@ -36,7 +36,7 @@ module.exports = class UsersView extends View }) @users = new UserCollection() @users.fetch() - @users.on('all', @render) + @listenTo(@users, 'all', @render) getRenderData: => c = super() diff --git a/app/views/editor/article/edit.coffee b/app/views/editor/article/edit.coffee index 2a7840e9a..42450f90f 100644 --- a/app/views/editor/article/edit.coffee +++ b/app/views/editor/article/edit.coffee @@ -20,15 +20,15 @@ module.exports = class ArticleEditView extends View @article = new Article(_id: @articleID) @article.saveBackups = true @article.fetch() - @article.once('sync', @onArticleSync) - @article.on('schema-loaded', @buildTreema) + @listenToOnce(@article, 'sync', @onArticleSync) + @listenTo(@article, 'schema-loaded', @buildTreema) @pushChangesToPreview = _.throttle(@pushChangesToPreview, 500) - onArticleSync: => + onArticleSync: -> @article.loaded = true @buildTreema() - buildTreema: => + buildTreema: -> return if @treema? or (not @article.loaded) or (not Article.hasSchema()) unless @article.attributes.body @article.set('body', '') diff --git a/app/views/kinds/SearchView.coffee b/app/views/kinds/SearchView.coffee index 6fae0228d..9ecc669b9 100644 --- a/app/views/kinds/SearchView.coffee +++ b/app/views/kinds/SearchView.coffee @@ -64,7 +64,7 @@ module.exports = class ThangTypeHomeView extends View @collection = new SearchCollection(@modelURL, @model, term) @collection.term = term # needed? - @collection.on('sync', @onSearchChange) + @listenTo(@collection, 'sync', @onSearchChange) @showLoading(@$el.find('.results')) @updateHash(term) @@ -79,7 +79,7 @@ module.exports = class ThangTypeHomeView extends View return false unless @collection return term is @collection.term - onSearchChange: => + onSearchChange: -> @hideLoading() documents = @collection.models table = $(@tableTemplate(documents:documents)) @@ -88,7 +88,6 @@ module.exports = class ThangTypeHomeView extends View removeOldSearch: -> return unless @collection? - @collection.off() @collection = null makeNewModel: (e) -> diff --git a/app/views/modal/versions_modal.coffee b/app/views/modal/versions_modal.coffee index 212572666..97aeafb33 100755 --- a/app/views/modal/versions_modal.coffee +++ b/app/views/modal/versions_modal.coffee @@ -23,14 +23,14 @@ module.exports = class VersionsModalView extends ModalView super options @view = new model(_id: @ID) @view.fetch() - @view.once('sync', @onViewSync) + @listenToOnce(@view, 'sync', @onViewSync) - onViewSync: => + onViewSync: -> @collection = new VersionsViewCollection(@url, @view.attributes.original, @model) @collection.fetch() - @collection.on('sync', @onVersionFetched) + @listenTo(@collection, 'sync', @onVersionFetched) - onVersionFetched: => + onVersionFetched: -> @startsLoading = false @render() diff --git a/app/views/play/level/playback_view.coffee b/app/views/play/level/playback_view.coffee index 6bd9144e7..b226a2d3b 100644 --- a/app/views/play/level/playback_view.coffee +++ b/app/views/play/level/playback_view.coffee @@ -43,13 +43,13 @@ module.exports = class PlaybackView extends View constructor: -> super(arguments...) - me.on('change:music', @updateMusicButton, @) + @listenTo(me, 'change:music', @updateMusicButton) afterRender: -> super() @hookUpScrubber() @updateMusicButton() - $(window).on('resize', @onWindowResize) + @listenTo($(window), 'resize', @onWindowResize) # callbacks @@ -223,7 +223,5 @@ module.exports = class PlaybackView extends View $(document.activeElement).blur() destroy: -> - me.off('change:music', @updateMusicButton, @) - $(window).off('resize', @onWindowResize) @onWindowResize = null super() diff --git a/app/views/play/level_view.coffee b/app/views/play/level_view.coffee index 98b1d3cd8..4d7e76a3e 100644 --- a/app/views/play/level_view.coffee +++ b/app/views/play/level_view.coffee @@ -82,8 +82,8 @@ module.exports = class PlayLevelView extends View @isEditorPreview = @getQueryVariable 'dev' @sessionID = @getQueryVariable 'session' - $(window).on('resize', @onWindowResize) - @supermodel.once 'error', @onLevelLoadError + @listenTo($(window), 'resize', @onWindowResize) + @listenToOnce(@supermodel, 'error', @onLevelLoadError) @saveScreenshot = _.throttle @saveScreenshot, 30000 if @isEditorPreview @@ -95,7 +95,7 @@ module.exports = class PlayLevelView extends View else @load() - onLevelLoadError: (e) => + onLevelLoadError: (e) -> application.router.navigate "/play?not_found=#{@levelID}", {trigger: true} setLevel: (@level, @supermodel) -> @@ -108,8 +108,8 @@ module.exports = class PlayLevelView extends View load: -> @levelLoader = new LevelLoader supermodel: @supermodel, levelID: @levelID, sessionID: @sessionID, opponentSessionID: @getQueryVariable('opponent'), team: @getQueryVariable("team") - @levelLoader.once 'loaded-all', @onLevelLoaderLoaded, @ - @levelLoader.on 'progress', @onLevelLoaderProgressChanged, @ + @listenToOnce(@levelLoader, 'loaded-all', @onLevelLoaderLoaded) + @listenTo(@levelLoader, 'progress', @onLevelLoaderProgressChanged) @god = new God() getRenderData: -> @@ -168,7 +168,7 @@ module.exports = class PlayLevelView extends View @initScriptManager() @insertSubviews ladderGame: (@level.get('type') is "ladder") @initVolume() - @session.on 'change:multiplayer', @onMultiplayerChanged, @ + @listenTo(@session, 'change:multiplayer', @onMultiplayerChanged) @originalSessionState = $.extend(true, {}, @session.get('state')) @register() @controlBar.setBus(@bus) @@ -462,20 +462,16 @@ module.exports = class PlayLevelView extends View AudioPlayer.preloadSoundReference sound destroy: -> - @supermodel?.off 'error', @onLevelLoadError - @levelLoader?.off 'loaded-all', @onLevelLoaderLoaded @levelLoader?.destroy() @surface?.destroy() @god?.destroy() @goalManager?.destroy() @scriptManager?.destroy() - $(window).off('resize', @onWindowResize) delete window.world # not sure where this is set, but this is one way to clean it up clearInterval(@pointerInterval) @bus?.destroy() #@instance.save() unless @instance.loading console.profileEnd?() if PROFILE_ME - @session?.off 'change:multiplayer', @onMultiplayerChanged, @ @onLevelLoadError = null @onLevelLoaderLoaded = null @onSupermodelLoadedOne = null diff --git a/app/views/play/spectate_view.coffee b/app/views/play/spectate_view.coffee index 97653ff78..18821ca4f 100644 --- a/app/views/play/spectate_view.coffee +++ b/app/views/play/spectate_view.coffee @@ -68,8 +68,8 @@ module.exports = class SpectateLevelView extends View constructor: (options, @levelID) -> console.profile?() if PROFILE_ME super options - $(window).on('resize', @onWindowResize) - @supermodel.once 'error', @onLevelLoadError + @listenTo($(window), 'resize', @onWindowResize) + @listenToOnce(@supermodel, 'error', @onLevelLoadError) @sessionOne = @getQueryVariable 'session-one' @sessionTwo = @getQueryVariable 'session-two' @@ -105,8 +105,8 @@ module.exports = class SpectateLevelView extends View opponentSessionID: @sessionTwo spectateMode: true team: @getQueryVariable("team") - @levelLoader.once 'loaded-all', @onLevelLoaderLoaded, @ - @levelLoader.on 'progress', @onLevelLoaderProgressChanged, @ + @listenToOnce(@levelLoader, 'loaded-all', @onLevelLoaderLoaded) + @listenTo(@levelLoader, 'progress', @onLevelLoaderProgressChanged) @god = new God maxWorkerPoolSize: 1, maxAngels: 1 getRenderData: -> @@ -467,18 +467,14 @@ module.exports = class SpectateLevelView extends View cb(null, $.parseJSON(jqxhr.responseText)) destroy: ()-> - @supermodel?.off 'error', @onLevelLoadError - @levelLoader?.off 'loaded-all', @onLevelLoaderLoaded @levelLoader?.destroy() @surface?.destroy() @god?.destroy() @goalManager?.destroy() @scriptManager?.destroy() - $(window).off('resize', @onWindowResize) delete window.world # not sure where this is set, but this is one way to clean it up clearInterval(@pointerInterval) console.profileEnd?() if PROFILE_ME - @session?.off 'change:multiplayer', @onMultiplayerChanged, @ @onLevelLoadError = null @onLevelLoaderLoaded = null @onSupermodelLoadedOne = null