From 9c719263d659b59f6c544672cfbbf6c19d1f6354 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 21 Sep 2015 21:12:09 -0400
Subject: [PATCH] clean up
---
js/menus/MaterialEditorMenuView.js | 9 ++++-----
js/menus/MenuParentView.js | 12 ++++++------
js/menus/MenuWrapperView.js | 15 ++++++---------
3 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/js/menus/MaterialEditorMenuView.js b/js/menus/MaterialEditorMenuView.js
index 04b044ba..7d7c6046 100644
--- a/js/menus/MaterialEditorMenuView.js
+++ b/js/menus/MaterialEditorMenuView.js
@@ -56,16 +56,15 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'materials', 'text!materi
fileSaver.saveMaterial(this.materialID, this.material);
},
- saveExitMenu: function(e, callback){
- e.preventDefault();
+ saveExitMenu: function(){
if (this.material.name == "") this.material.name = "Material " + materialNameIndex++;
materials.setMaterial(this.materialID, _.clone(this.material));
- callback();
+ return true;
},
- deleteExitMenu: function(e, callback){
+ deleteExitMenu: function(){
var deleted = materials.deleteMaterial(this.materialID);
- if (deleted) callback();
+ return deleted;
},
_makeTemplateJSON: function(){
diff --git a/js/menus/MenuParentView.js b/js/menus/MenuParentView.js
index e801b3d4..135de2e9 100644
--- a/js/menus/MenuParentView.js
+++ b/js/menus/MenuParentView.js
@@ -20,16 +20,16 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone){
return null;//override in subclasses
},
- deleteExitMenu: function(e, callback){
- callback();
+ deleteExitMenu: function(e){
+ return true;
},
- cancelExitMenu: function(e, callback){
- callback();
+ cancelExitMenu: function(e){
+ return true;
},
- saveExitMenu: function(e, callback){
- callback();
+ saveExitMenu: function(e){
+ return true;
},
render: function(){
diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js
index 38279957..4f07aa82 100644
--- a/js/menus/MenuWrapperView.js
+++ b/js/menus/MenuWrapperView.js
@@ -239,25 +239,22 @@ define(['jquery', 'underscore', 'plist', 'backbone', 'lattice', 'appState', 'tex
_deleteExitMenu: function(e){
e.preventDefault();
var nextNav = this._getNextNav();
- this.menu.deleteExitMenu(e, function(){
- appState.set("currentNav", nextNav);
- });
+ var shouldExit = this.menu.deleteExitMenu(e);
+ if (shouldExit) appState.set("currentNav", nextNav)
},
_cancelExitMenu: function(e){
e.preventDefault();
var nextNav = this._getNextNav();
- this.menu.cancelExitMenu(e, function(){
- appState.set("currentNav", nextNav);
- });
+ var shouldExit = this.menu.cancelExitMenu(e);
+ if (shouldExit) appState.set("currentNav", nextNav);
},
_saveExitMenu: function(e){
e.preventDefault();
var nextNav = this._getNextNav();
- this.menu.saveExitMenu(e, function(){
- appState.set("currentNav", nextNav);
- });
+ var shouldExit = this.menu.saveExitMenu(e);
+ if (shouldExit) appState.set("currentNav", nextNav)
},
_getNextNav: function(){
--
GitLab