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/03/26 22:47:05 UTC
svn commit: r1305570 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
index.html js/archiva/i18nload.js js/archiva/main.js js/archiva/search.js
js/archiva/utils.js js/startup.js
Author: olamy
Date: Mon Mar 26 20:47:04 2012
New Revision: 1305570
URL: http://svn.apache.org/viewvc?rev=1305570&view=rev
Log:
load all external librairies tru require js
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js
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/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
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/startup.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=1305570&r1=1305569&r2=1305570&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 Mon Mar 26 20:47:04 2012
@@ -12,7 +12,6 @@
<script type="text/javascript" src="js/lab.js"></script>
<script type="text/javascript" src="js/require.1.0.7.js"></script>
- <script type="text/javascript" src="js/jquery.i18n.properties-1.0.9.js"></script>
<title>Apache Archiva</title>
@@ -57,12 +56,25 @@
"jquery": "jquery-1.7.2",
"jquery_tmpl": "jquery.tmpl",
"utils": "archiva/utils",
- "jquery_ui": "jquery-ui-1.8.16.custom.min"
+ "jquery_ui": "jquery-ui-1.8.16.custom.min",
+ "jquery_cookie": "jquery.cookie.1.0.0",
+ "bootstrap": "bootstrap.2.0.2",
+ "choosen": "chosen.jquery-0.9.7",
+ "jquery_validate": "jquery.validate-1.9.0",
+ "jquery_json": "jquery.json-2.3.min",
+ "knockout.simpleGrid": "knockout.simpleGrid",
+ "knockout": "knockout-2.0.0.debug",
+ "knockout.sortable": "knockout-sortable"
}
+ // file upload dependencies
+ //.script("jquery.iframe-transport-1.4.js").wait()
+ //.script("jquery.fileupload-5.10.0.js").wait()
+ //.script("jquery.fileupload-ip-1.0.6.js").wait()
+ //.script("jquery.fileupload-ui-6.6.3.js" ).wait()
});
- require(['domReady','startup','jquery'], function (domReady) {
+ require(['domReady','jquery','i18n','startup'], function (domReady) {
domReady.withResources(function () {
-
+ loadi18n();
$.ajax(
{
url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),
@@ -74,9 +86,10 @@
require.config({
baseUrl: "js/",
+ urlArgs: "_="+new Date().getTime(),
"paths": {
- "redback": buildLoadJsUrl("redback/redback.js"),
- "i18nLoad": buildLoadJsUrl("archiva/i18nload.js")
+ "redback": buildLoadJsUrl("redback/redback.js")
+
}
});
@@ -89,14 +102,6 @@
};
$LAB.setGlobalDefaults(options);
$LAB
- //.script(buildLoadJsUrl("jquery.tmpl.js")).wait()
- //.script(buildLoadJsUrl("archiva/utils.js")).wait()
- .script(buildLoadJsUrl("archiva/i18nload.js")).wait()
- .script("jquery.cookie.1.0.0.js").wait()
- .script("knockout-2.0.0.debug.js").wait()
- //.script("jquery-ui-1.8.16.custom.min.js").wait()
- .script("jquery.validate-1.9.0.js").wait()
- .script("jquery.json-2.3.min.js").wait()
.script(buildLoadJsUrl("archiva/main-tmpl.js")).wait()
.script(buildLoadJsUrl("archiva/general-admin.js"))
.script(buildLoadJsUrl("archiva/repositories.js")).wait()
@@ -104,19 +109,9 @@
.script(buildLoadJsUrl("archiva/proxy-connectors.js")).wait()
.script(buildLoadJsUrl("redback/operation.js")).wait()
.script(buildLoadJsUrl("archiva/repository-groups.js")).wait()
- .script(buildLoadJsUrl("archiva/search.js")).wait()
.script(buildLoadJsUrl("redback/redback-tmpl.js")).wait()
- .script("chosen.jquery-0.9.7.js" )
- .script("bootstrap.2.0.2.js" )
- .script(buildLoadJsUrl("knockout.simpleGrid.js"))
- .script(buildLoadJsUrl("knockout-sortable.js"))
- //.script("jquery.iframe-transport-1.4.js").wait()
- //.script("jquery.fileupload-5.10.0.js").wait()
- //.script("jquery.fileupload-ip-1.0.6.js").wait()
- //.script("jquery.fileupload-ui-6.6.3.js" ).wait()
.script(buildLoadJsUrl("redback/user.js")).wait()
.script(buildLoadJsUrl("redback/users.js")).wait()
- //.script(buildLoadJsUrl("redback/redback.js")).wait()
.script(buildLoadJsUrl("redback/register.js")).wait()
.script(buildLoadJsUrl("redback/permission.js")).wait()
.script(buildLoadJsUrl("redback/resource.js")).wait()
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1305570&r1=1305569&r2=1305570&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Mon Mar 26 20:47:04 2012
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-require( ["order!jquery" ,"order!redback/redback","jquery_ui"],
-function($) {
+require( ["order!jquery","jquery_ui","jquery_cookie","bootstrap","order!archiva/search",
+ "jquery_validate","jquery_json","order!knockout","order!redback/redback"],
+function() {
-$(function() {
// define a container object with various datas
window.archivaModel = {};
@@ -340,6 +340,5 @@ $(function() {
}
startArchivaApplication();
-})
});
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1305570&r1=1305569&r2=1305570&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Mon Mar 26 20:47:04 2012
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(function() {
+define("search",["jquery","i18n","jquery_tmpl","choosen","order!knockout","knockout.simpleGrid"], function() {
+
+
//-----------------------------------------
// browse part
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=1305570&r1=1305569&r2=1305570&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 Mon Mar 26 20:47:04 2012
@@ -19,6 +19,18 @@
define("utils",["jquery","i18n","jquery_tmpl"], function() {
+ loadi18n=function(){
+ var browserLang = usedLang();
+ $.log("use browserLang:"+browserLang);
+
+ var options = {
+ cache:false,
+ mode: 'map',
+ encoding:'utf-8'
+ };
+ loadAndParseFile("restServices/archivaServices/commonServices/getAllI18nResources?locale="+browserLang,options );
+ }
+
/**
* log message in the console
*/
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/startup.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/startup.js?rev=1305570&r1=1305569&r2=1305570&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/startup.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/startup.js Mon Mar 26 20:47:04 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-require(["jquery","i18n","js/archiva/utils.js"],
+require(["jquery","utils"],
function() {
@@ -33,9 +33,4 @@ function() {
dataType: 'json'
});
-
-
-
-
-
});
\ No newline at end of file