You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/07/10 12:39:43 UTC
svn commit: r1359581 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
index.html js/archiva/utils.js js/jquery.i18n.properties-1.0.9.js
Author: olamy
Date: Tue Jul 10 10:39:42 2012
New Revision: 1359581
URL: http://svn.apache.org/viewvc?rev=1359581&view=rev
Log:
make i18n more AMD compliant
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1359581&r1=1359580&r2=1359581&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html Tue Jul 10 10:39:42 2012
@@ -151,7 +151,7 @@
- require(['jquery','i18n','sammy','startup','domReady!'], function (domReady) {
+ require(['jquery','i18n','sammy','startup','utils','domReady!'], function (domReady) {
loadi18n(function () {
$.ajax({
url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1359581&r1=1359580&r2=1359581&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js Tue Jul 10 10:39:42 2012
@@ -20,6 +20,7 @@
define("utils",["jquery","i18n","jquery.tmpl"], function() {
loadi18n=function(loadCallback){
+ $.log("loadi18n");
var browserLang = usedLang();
$.log("use browserLang:"+browserLang);
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js?rev=1359581&r1=1359580&r2=1359581&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js Tue Jul 10 10:39:42 2012
@@ -12,6 +12,18 @@
*
*****************************************************************************/
+(function($, window) {
+ (function(factory){
+ // Support module loading scenarios
+ if (typeof define === 'function' && define.amd){
+ // AMD Anonymous Module
+ define(['jquery'], factory);
+ } else {
+ // No module loader (plain <script> tag) - put directly in global namespace
+ $.sammy = window.Sammy = factory($);
+ }
+ })
+
(function($) {
$.i18n = {};
@@ -478,5 +490,6 @@ String.prototype.split = function (separ
return cbSplit(this, separator, limit);
};
-})(jQuery);
-
\ No newline at end of file
+});
+
+})(jQuery, window);
\ No newline at end of file