Skip to content
This repository has been archived by the owner on Oct 30, 2018. It is now read-only.

Commit

Permalink
delinted
Browse files Browse the repository at this point in the history
  • Loading branch information
drewfish committed Oct 31, 2012
1 parent dfd833e commit fd4f2ff
Showing 1 changed file with 20 additions and 19 deletions.
39 changes: 20 additions & 19 deletions lib/app/addons/rs/yui.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ YUI.add('addon-rs-yui', function(Y, NAME) {
tests: true,
yui_modules: true
},
YUIsandbox = require(libpath.join(__dirname, '..', '..', '..', 'yui-sandbox.js')).getYUI(),

yuiSandbox = require(libpath.join(__dirname, '..', '..', '..', 'yui-sandbox.js')).getYUI(),
MODULE_META_ENTRIES = ['requires', 'use', 'optional', 'skinnable', 'after', 'condition'],
// TODO: revisit this list with @davglass
MODULE_META_PRIVATE_ENTRIES = ['after', 'expanded', 'supersedes', 'ext', '_parsed', '_inspected', 'skinCache', 'langCache'],

REGEX_LANG_TOKEN = /\"\{langToken\}\"/g,
REGEX_LANG_PATH = /\{langPath\}/g,
REGEX_LOCALE = /\_([a-z]{2}(-[A-Z]{2})?)$/,

MODULE_TEMPLATES = {
'loader-app-base':
'YUI.add("loader-app-base",function(Y){' +
Expand Down Expand Up @@ -351,7 +351,7 @@ YUI.add('addon-rs-yui', function(Y, NAME) {

for (l = 0; l < langs.length; l += 1) {
lang = langs[l];
langExt = lang ? '_' + lang : '',
langExt = lang ? '_' + lang : '';

res = {
source: {},
Expand Down Expand Up @@ -473,6 +473,7 @@ YUI.add('addon-rs-yui', function(Y, NAME) {
lang,
mojits,
shared,
Ysandbox,
modules_config,
Ysanbdox,
loader,
Expand All @@ -495,7 +496,7 @@ YUI.add('addon-rs-yui', function(Y, NAME) {
mojits = this.getConfigAllMojits('client', {});
shared = this.getConfigShared('client', {});

Ysandbox = YUIsandbox({
Ysandbox = yuiSandbox({
fetchCSS: true,
combine: true,
base: "/static/combo?",
Expand Down Expand Up @@ -531,14 +532,14 @@ YUI.add('addon-rs-yui', function(Y, NAME) {
for (name in expanded_modules) {
if (expanded_modules.hasOwnProperty(name)) {
if (expanded_modules[name].owner &&
!expanded_modules[expanded_modules[name].owner]) {
!expanded_modules[expanded_modules[name].owner]) {
// if there is not a module corresponding with the lang pack
// that means the controller doesn't have client affinity,
// in that case, we don't need to ship it.
continue;
}
if ((lang === '*') ||
(expanded_modules[name].langPack === '*') ||
(expanded_modules[name].langPack === '*') ||
(!expanded_modules[name].langPack) ||
(lang === expanded_modules[name].langPack)) {

Expand All @@ -563,18 +564,18 @@ YUI.add('addon-rs-yui', function(Y, NAME) {
for (name in conditions) {
if (conditions.hasOwnProperty(name)) {
appMetaData.base[lang] = appMetaData.base[lang]
.replace('"{' + name + '}"', conditions[name]);
.replace('"{' + name + '}"', conditions[name]);
appMetaData.full[lang] = appMetaData.full[lang]
.replace('"{' + name + '}"', conditions[name]);
.replace('"{' + name + '}"', conditions[name]);
yuiMetaData.base[lang] = yuiMetaData.base[lang]
.replace('"{' + name + '}"', conditions[name]);
.replace('"{' + name + '}"', conditions[name]);
yuiMetaData.full[lang] = yuiMetaData.full[lang]
.replace('"{' + name + '}"', conditions[name]);
.replace('"{' + name + '}"', conditions[name]);
}
}
} // for each lang

this.resContents['yui-loader-rollup-'] = MODULE_TEMPLATES['loader'];
this.resContents['yui-loader-rollup-'] = MODULE_TEMPLATES.loader;

for (i = 0; i < langs.length; i += 1) {
lang = langs[i] || '';
Expand Down Expand Up @@ -605,13 +606,13 @@ YUI.add('addon-rs-yui', function(Y, NAME) {
*/
_processMeta: function(resolvedMods, modules, expanded_modules, conditions) {
var m,
l,
i,
module,
name,
mod,
lang,
bundle;
l,
i,
module,
name,
mod,
lang,
bundle;

for (m in resolvedMods) {
if (resolvedMods.hasOwnProperty(m)) {
Expand Down

0 comments on commit fd4f2ff

Please sign in to comment.