mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 17:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mysterious error with process require

Browse source
This commit is contained in:
Peter Cottle 2015-03-28 11:11:55 -07:00
parent 811b9c1b0e
commit b4a6ac3784
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -23,6 +23,7 @@
}, },
"dependencies": { "dependencies": {
"backbone": "~0.9.9", "backbone": "~0.9.9",
"events": "^1.0.2",
"flux": "^2.0.1", "flux": "^2.0.1",
"jquery": "~1.7.3", "jquery": "~1.7.3",
"markdown": "~0.4.0", "markdown": "~0.4.0",

7
src/__tests__/casperjs/locale_header_test.js
View file

@ -1,3 +1,4 @@
//var LocaleStore = require('../../js/stores/LocaleStore');
var CasperUtils = require('./casperUtils').CasperUtils; var CasperUtils = require('./casperUtils').CasperUtils;
var intl = require('../../js/intl/index.js'); var intl = require('../../js/intl/index.js');
@ -28,11 +29,11 @@ casper.start(
); );
this.test.assertEvalEquals(function(lang) { this.test.assertEvalEquals(function(lang) {
debug_App_changeLocaleFromHeaders(lang); debug_LocaleActions_changeLocaleFromHeader(lang);
return debug_Intl_getLocale(); return debug_LocaleStore_getLocale();
}, },
locale, locale,
'Testing changing the locale from ' + lang + 'Testing changing store locale from ' + lang +
' to ' + locale, ' to ' + locale,
{ lang: lang } { lang: lang }
); );

5
src/js/app/index.js
View file

@ -44,7 +44,7 @@ var init = function() {
wait: true wait: true
}); });
LocaleStore.subscribe('change', intlRefresh); LocaleStore.subscribe(intlRefresh);
events.on('localeChanged', intlRefresh); events.on('localeChanged', intlRefresh);
events.on('vcsModeChange', vcsModeRefresh); events.on('vcsModeChange', vcsModeRefresh);
@ -68,6 +68,7 @@ var vcsModeRefresh = function(eventData) {
}; };
var intlRefresh = function() { var intlRefresh = function() {
console.log('refreshing inlt');
if (!window.$) { return; } if (!window.$) { return; }
$('span.intl-aware').each(function(i, el) { $('span.intl-aware').each(function(i, el) {
var intl = require('../intl'); var intl = require('../intl');
@ -253,7 +254,7 @@ function tryLocaleDetect() {
} }
function changeLocaleFromHeaders(langString) { function changeLocaleFromHeaders(langString) {
LocaleActions.changeLocaleFromHeaders(langString); LocaleActions.changeLocaleFromHeader(langString);
GlobalState.locale = LocaleStore.getLocale(); GlobalState.locale = LocaleStore.getLocale();
events.trigger('localeChanged'); events.trigger('localeChanged');
} }

1
src/js/util/debug.js
View file

@ -6,6 +6,7 @@ var toGlobalize = {
Visuals: require('../visuals'), Visuals: require('../visuals'),
Git: require('../git'), Git: require('../git'),
CommandModel: require('../models/commandModel'), CommandModel: require('../models/commandModel'),
LocaleActions: require('../actions/LocaleActions'),
LocaleStore: require('../stores/LocaleStore'), LocaleStore: require('../stores/LocaleStore'),
Levels: require('../graph/treeCompare'), Levels: require('../graph/treeCompare'),
Constants: require('../util/constants'), Constants: require('../util/constants'),