From b4a6ac37841c56eefb8ed51991a1eed88e5af514 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Sat, 28 Mar 2015 11:11:55 -0700 Subject: [PATCH] mysterious error with process require --- package.json | 1 + src/__tests__/casperjs/locale_header_test.js | 7 ++++--- src/js/app/index.js | 5 +++-- src/js/util/debug.js | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b3712b70..e31aacd6 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ }, "dependencies": { "backbone": "~0.9.9", + "events": "^1.0.2", "flux": "^2.0.1", "jquery": "~1.7.3", "markdown": "~0.4.0", diff --git a/src/__tests__/casperjs/locale_header_test.js b/src/__tests__/casperjs/locale_header_test.js index 57c04f5e..f2471c34 100644 --- a/src/__tests__/casperjs/locale_header_test.js +++ b/src/__tests__/casperjs/locale_header_test.js @@ -1,3 +1,4 @@ +//var LocaleStore = require('../../js/stores/LocaleStore'); var CasperUtils = require('./casperUtils').CasperUtils; var intl = require('../../js/intl/index.js'); @@ -28,11 +29,11 @@ casper.start( ); this.test.assertEvalEquals(function(lang) { - debug_App_changeLocaleFromHeaders(lang); - return debug_Intl_getLocale(); + debug_LocaleActions_changeLocaleFromHeader(lang); + return debug_LocaleStore_getLocale(); }, locale, - 'Testing changing the locale from ' + lang + + 'Testing changing store locale from ' + lang + ' to ' + locale, { lang: lang } ); diff --git a/src/js/app/index.js b/src/js/app/index.js index 4ca353ee..5ae470b8 100644 --- a/src/js/app/index.js +++ b/src/js/app/index.js @@ -44,7 +44,7 @@ var init = function() { wait: true }); - LocaleStore.subscribe('change', intlRefresh); + LocaleStore.subscribe(intlRefresh); events.on('localeChanged', intlRefresh); events.on('vcsModeChange', vcsModeRefresh); @@ -68,6 +68,7 @@ var vcsModeRefresh = function(eventData) { }; var intlRefresh = function() { + console.log('refreshing inlt'); if (!window.$) { return; } $('span.intl-aware').each(function(i, el) { var intl = require('../intl'); @@ -253,7 +254,7 @@ function tryLocaleDetect() { } function changeLocaleFromHeaders(langString) { - LocaleActions.changeLocaleFromHeaders(langString); + LocaleActions.changeLocaleFromHeader(langString); GlobalState.locale = LocaleStore.getLocale(); events.trigger('localeChanged'); } diff --git a/src/js/util/debug.js b/src/js/util/debug.js index 2e743d21..ea9a05f0 100644 --- a/src/js/util/debug.js +++ b/src/js/util/debug.js @@ -6,6 +6,7 @@ var toGlobalize = { Visuals: require('../visuals'), Git: require('../git'), CommandModel: require('../models/commandModel'), + LocaleActions: require('../actions/LocaleActions'), LocaleStore: require('../stores/LocaleStore'), Levels: require('../graph/treeCompare'), Constants: require('../util/constants'),