mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-07-01 18:24:28 +02:00
Use Object.assign
instead of module assign
This commit is contained in:
parent
06e0f29acf
commit
58f2dc4156
4 changed files with 7 additions and 14 deletions
|
@ -4,8 +4,6 @@ var AppConstants = require('../constants/AppConstants');
|
||||||
var AppDispatcher = require('../dispatcher/AppDispatcher');
|
var AppDispatcher = require('../dispatcher/AppDispatcher');
|
||||||
var EventEmitter = require('events').EventEmitter;
|
var EventEmitter = require('events').EventEmitter;
|
||||||
|
|
||||||
var assign = require('object-assign');
|
|
||||||
|
|
||||||
var ActionTypes = AppConstants.ActionTypes;
|
var ActionTypes = AppConstants.ActionTypes;
|
||||||
var COMMAND_HISTORY_KEY = 'lgb_CommandHistory';
|
var COMMAND_HISTORY_KEY = 'lgb_CommandHistory';
|
||||||
var COMMAND_HISTORY_MAX_LENGTH = 100;
|
var COMMAND_HISTORY_MAX_LENGTH = 100;
|
||||||
|
@ -38,7 +36,7 @@ function _saveToLocalStorage() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var CommandLineStore = assign(
|
var CommandLineStore = Object.assign(
|
||||||
{},
|
{},
|
||||||
EventEmitter.prototype,
|
EventEmitter.prototype,
|
||||||
AppConstants.StoreSubscribePrototype,
|
AppConstants.StoreSubscribePrototype,
|
||||||
|
|
|
@ -4,15 +4,13 @@ var AppConstants = require('../constants/AppConstants');
|
||||||
var AppDispatcher = require('../dispatcher/AppDispatcher');
|
var AppDispatcher = require('../dispatcher/AppDispatcher');
|
||||||
var EventEmitter = require('events').EventEmitter;
|
var EventEmitter = require('events').EventEmitter;
|
||||||
|
|
||||||
var assign = require('object-assign');
|
|
||||||
|
|
||||||
var ActionTypes = AppConstants.ActionTypes;
|
var ActionTypes = AppConstants.ActionTypes;
|
||||||
|
|
||||||
var _isAnimating = false;
|
var _isAnimating = false;
|
||||||
var _flipTreeY = false;
|
var _flipTreeY = false;
|
||||||
var _numLevelsSolved = 0;
|
var _numLevelsSolved = 0;
|
||||||
|
|
||||||
var GlobalStateStore = assign(
|
var GlobalStateStore = Object.assign(
|
||||||
{},
|
{},
|
||||||
EventEmitter.prototype,
|
EventEmitter.prototype,
|
||||||
AppConstants.StoreSubscribePrototype,
|
AppConstants.StoreSubscribePrototype,
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
var AppConstants = require('../constants/AppConstants');
|
var AppConstants = require('../constants/AppConstants');
|
||||||
var AppDispatcher = require('../dispatcher/AppDispatcher');
|
var AppDispatcher = require('../dispatcher/AppDispatcher');
|
||||||
var EventEmitter = require('events').EventEmitter;
|
var EventEmitter = require('events').EventEmitter;
|
||||||
var assign = require('object-assign');
|
|
||||||
var levelSequences = require('../../levels').levelSequences;
|
var levelSequences = require('../../levels').levelSequences;
|
||||||
var sequenceInfo = require('../../levels').sequenceInfo;
|
var sequenceInfo = require('../../levels').sequenceInfo;
|
||||||
|
|
||||||
|
@ -62,7 +61,7 @@ Object.keys(levelSequences).forEach(function(levelSequenceName) {
|
||||||
validateLevel(level);
|
validateLevel(level);
|
||||||
|
|
||||||
var id = levelSequenceName + String(index + 1);
|
var id = levelSequenceName + String(index + 1);
|
||||||
var compiledLevel = assign(
|
var compiledLevel = Object.assign(
|
||||||
{},
|
{},
|
||||||
level,
|
level,
|
||||||
{
|
{
|
||||||
|
@ -78,7 +77,7 @@ Object.keys(levelSequences).forEach(function(levelSequenceName) {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
var LevelStore = assign(
|
var LevelStore = Object.assign(
|
||||||
{},
|
{},
|
||||||
EventEmitter.prototype,
|
EventEmitter.prototype,
|
||||||
AppConstants.StoreSubscribePrototype,
|
AppConstants.StoreSubscribePrototype,
|
||||||
|
|
|
@ -4,8 +4,6 @@ var AppConstants = require('../constants/AppConstants');
|
||||||
var AppDispatcher = require('../dispatcher/AppDispatcher');
|
var AppDispatcher = require('../dispatcher/AppDispatcher');
|
||||||
var EventEmitter = require('events').EventEmitter;
|
var EventEmitter = require('events').EventEmitter;
|
||||||
|
|
||||||
var assign = require('object-assign');
|
|
||||||
|
|
||||||
var ActionTypes = AppConstants.ActionTypes;
|
var ActionTypes = AppConstants.ActionTypes;
|
||||||
var DEFAULT_LOCALE = 'en_US';
|
var DEFAULT_LOCALE = 'en_US';
|
||||||
|
|
||||||
|
@ -55,7 +53,7 @@ function _getLocaleFromHeader(langString) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var _locale = DEFAULT_LOCALE;
|
var _locale = DEFAULT_LOCALE;
|
||||||
var LocaleStore = assign(
|
var LocaleStore = Object.assign(
|
||||||
{},
|
{},
|
||||||
EventEmitter.prototype,
|
EventEmitter.prototype,
|
||||||
AppConstants.StoreSubscribePrototype,
|
AppConstants.StoreSubscribePrototype,
|
||||||
|
@ -66,11 +64,11 @@ AppConstants.StoreSubscribePrototype,
|
||||||
},
|
},
|
||||||
|
|
||||||
getLangLocaleMap: function() {
|
getLangLocaleMap: function() {
|
||||||
return assign({}, langLocaleMap);
|
return Object.assign({}, langLocaleMap);
|
||||||
},
|
},
|
||||||
|
|
||||||
getHeaderLocaleMap: function() {
|
getHeaderLocaleMap: function() {
|
||||||
return assign({}, headerLocaleMap);
|
return Object.assign({}, headerLocaleMap);
|
||||||
},
|
},
|
||||||
|
|
||||||
getLocale: function() {
|
getLocale: function() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue