equal
deleted
inserted
replaced
78 SimileAjax.includeJavascriptFiles = function(doc, urlPrefix, filenames) { |
78 SimileAjax.includeJavascriptFiles = function(doc, urlPrefix, filenames) { |
79 for (var i = 0; i < filenames.length; i++) { |
79 for (var i = 0; i < filenames.length; i++) { |
80 SimileAjax.includeJavascriptFile(doc, urlPrefix + filenames[i]); |
80 SimileAjax.includeJavascriptFile(doc, urlPrefix + filenames[i]); |
81 } |
81 } |
82 SimileAjax.loadingScriptsCount += filenames.length; |
82 SimileAjax.loadingScriptsCount += filenames.length; |
83 SimileAjax.includeJavascriptFile(doc, SimileAjax.urlPrefix + "scripts/signal.js?" + filenames.length); |
83 // XXX adim SimileAjax.includeJavascriptFile(doc, SimileAjax.urlPrefix + "scripts/signal.js?" + filenames.length); |
84 }; |
84 }; |
85 SimileAjax.includeCssFile = function(doc, url) { |
85 SimileAjax.includeCssFile = function(doc, url) { |
86 if (doc.body == null) { |
86 if (doc.body == null) { |
87 try { |
87 try { |
88 doc.write("<link rel='stylesheet' href='" + url + "' type='text/css'/>"); |
88 doc.write("<link rel='stylesheet' href='" + url + "' type='text/css'/>"); |
206 // if (SimileAjax.params.bundle) { |
206 // if (SimileAjax.params.bundle) { |
207 // SimileAjax.includeJavascriptFiles(document, SimileAjax.urlPrefix, [ "simile-ajax-bundle.js" ]); |
207 // SimileAjax.includeJavascriptFiles(document, SimileAjax.urlPrefix, [ "simile-ajax-bundle.js" ]); |
208 // } else { |
208 // } else { |
209 // SimileAjax.includeJavascriptFiles(document, SimileAjax.urlPrefix + "scripts/", javascriptFiles); |
209 // SimileAjax.includeJavascriptFiles(document, SimileAjax.urlPrefix + "scripts/", javascriptFiles); |
210 // } |
210 // } |
211 SimileAjax.includeCssFiles(document, SimileAjax.urlPrefix + "styles/", cssFiles); |
211 // SimileAjax.includeCssFiles(document, SimileAjax.urlPrefix + "styles/", cssFiles); |
212 |
212 |
213 SimileAjax.loaded = true; |
213 SimileAjax.loaded = true; |
214 })(); |
214 })(); |
215 } |
215 } |
216 /*================================================== |
216 /*================================================== |
3828 */ |
3828 */ |
3829 if (bundle) { |
3829 if (bundle) { |
3830 includeJavascriptFiles(Timeline.urlPrefix, [ "timeline-bundle.js" ]); |
3830 includeJavascriptFiles(Timeline.urlPrefix, [ "timeline-bundle.js" ]); |
3831 includeCssFiles(Timeline.urlPrefix, [ "timeline-bundle.css" ]); |
3831 includeCssFiles(Timeline.urlPrefix, [ "timeline-bundle.css" ]); |
3832 } else { |
3832 } else { |
3833 includeJavascriptFiles(Timeline.urlPrefix + "scripts/", javascriptFiles); |
3833 // XXX adim includeJavascriptFiles(Timeline.urlPrefix + "scripts/", javascriptFiles); |
3834 includeCssFiles(Timeline.urlPrefix + "styles/", cssFiles); |
3834 // XXX adim includeCssFiles(Timeline.urlPrefix + "styles/", cssFiles); |
3835 } |
3835 } |
3836 |
3836 |
3837 /* |
3837 /* |
3838 * Include localized files |
3838 * Include localized files |
3839 */ |
3839 */ |
3877 } |
3877 } |
3878 |
3878 |
3879 for (var l = 0; l < supportedLocales.length; l++) { |
3879 for (var l = 0; l < supportedLocales.length; l++) { |
3880 var locale = supportedLocales[l]; |
3880 var locale = supportedLocales[l]; |
3881 if (loadLocale[locale]) { |
3881 if (loadLocale[locale]) { |
3882 includeJavascriptFiles(Timeline.urlPrefix + "scripts/l10n/" + locale + "/", localizedJavascriptFiles); |
3882 // XXX adim includeJavascriptFiles(Timeline.urlPrefix + "scripts/l10n/" + locale + "/", localizedJavascriptFiles); |
3883 includeCssFiles(Timeline.urlPrefix + "styles/l10n/" + locale + "/", localizedCssFiles); |
3883 // XXX adim includeCssFiles(Timeline.urlPrefix + "styles/l10n/" + locale + "/", localizedCssFiles); |
3884 } |
3884 } |
3885 } |
3885 } |
3886 |
3886 |
3887 if (forceLocale == null) { |
3887 if (forceLocale == null) { |
3888 Timeline.serverLocale = defaultServerLocale; |
3888 Timeline.serverLocale = defaultServerLocale; |