From f02ad943e5f72c668518c6233a61891d642c85f8 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Sun, 1 Mar 2015 08:49:42 -0800 Subject: [PATCH] Rename `ModController` to `ModSelectorController` --- src/css/templates/index.scss | 2 +- src/css/templates/{mod.scss => mod_selector.scss} | 0 src/scripts/controllers/mod_pack_controller.coffee | 12 ++++++------ ...troller.coffee => mod_selector_controller.coffee} | 6 +++--- src/templates/{mod.jade => mod_selector.jade} | 0 5 files changed, 10 insertions(+), 10 deletions(-) rename src/css/templates/{mod.scss => mod_selector.scss} (100%) rename src/scripts/controllers/{mod_controller.coffee => mod_selector_controller.coffee} (93%) rename src/templates/{mod.jade => mod_selector.jade} (100%) diff --git a/src/css/templates/index.scss b/src/css/templates/index.scss index 4fc65273c..1fdecac47 100644 --- a/src/css/templates/index.scss +++ b/src/css/templates/index.scss @@ -16,7 +16,7 @@ All rights reserved. @import 'item'; @import 'item_page'; @import 'minimal_recipe'; -@import 'mod'; @import 'mod_pack'; @import 'mod_page'; +@import 'mod_selector'; @import 'stack'; diff --git a/src/css/templates/mod.scss b/src/css/templates/mod_selector.scss similarity index 100% rename from src/css/templates/mod.scss rename to src/css/templates/mod_selector.scss diff --git a/src/scripts/controllers/mod_pack_controller.coffee b/src/scripts/controllers/mod_pack_controller.coffee index bf04ada89..c71118c37 100644 --- a/src/scripts/controllers/mod_pack_controller.coffee +++ b/src/scripts/controllers/mod_pack_controller.coffee @@ -5,11 +5,11 @@ Copyright (c) 2014-2015 by Redwood Labs All rights reserved. ### -BaseController = require './base_controller' -{DefaultMods} = require '../constants' -{Duration} = require '../constants' -Mod = require '../models/mod' -ModController = require './mod_controller' +BaseController = require './base_controller' +{DefaultMods} = require '../constants' +{Duration} = require '../constants' +Mod = require '../models/mod' +ModSelectorController = require './mod_selector_controller' ######################################################################################################################## @@ -50,7 +50,7 @@ module.exports = class ModPackController extends BaseController index++ while @_controllers.length < mods.length - controller = new ModController model:mods[index], storage:@storage + controller = new ModSelectorController model:mods[index], storage:@storage controller.render() @_controllers.push controller controller.$el.hide duration:0 diff --git a/src/scripts/controllers/mod_controller.coffee b/src/scripts/controllers/mod_selector_controller.coffee similarity index 93% rename from src/scripts/controllers/mod_controller.coffee rename to src/scripts/controllers/mod_selector_controller.coffee index 1ae25ca94..fb0b05b30 100644 --- a/src/scripts/controllers/mod_controller.coffee +++ b/src/scripts/controllers/mod_selector_controller.coffee @@ -13,11 +13,11 @@ Mod = require '../models/mod' ######################################################################################################################## -module.exports = class ModController extends BaseController +module.exports = class ModSelectorController extends BaseController constructor: (options={})-> if not options.model? then throw new Error 'options.model is required' - options.templateName = 'mod' + options.templateName = 'mod_selector' super options @_storage = options.storage @@ -67,4 +67,4 @@ module.exports = class ModController extends BaseController events: -> return _.extend super, 'change select': 'onVersionChanged' - 'click a': 'routeLinkClick' + 'click a': 'routeLinkClick' diff --git a/src/templates/mod.jade b/src/templates/mod_selector.jade similarity index 100% rename from src/templates/mod.jade rename to src/templates/mod_selector.jade