Author: olamy
Date: Mon Mar 26 22:50:42 2012
New Revision: 1305651
URL: http://svn.apache.org/viewvc?rev=1305651&view=rev
Log:
no more need of lab.js all loading is tru requirejs
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/lab.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/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=1305651&r1=1305650&r2=1305651&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 22:50:42 2012
@@ -9,8 +9,6 @@
<script type="text/javascript" src="js/jquery-1.7.2.js"></script>
- <script type="text/javascript" src="js/lab.js"></script>
-
<script type="text/javascript" src="js/require.1.0.7.js"></script>
<title>Apache Archiva</title>
@@ -75,7 +73,8 @@
"repository-groups": "archiva/repository-groups",
"roles": "redback/roles",
"user": "redback/user",
- "users": "redback/users"
+ "users": "redback/users",
+ "archiva/main": "archiva/main"
}
// file upload dependencies
//.script("jquery.iframe-transport-1.4.js").wait()
@@ -86,29 +85,21 @@
require(['order!domReady','order!jquery','order!i18n','order!startup'],
function (domReady) {
domReady.withResources(function () {
loadi18n();
- $.ajax(
- {
+ $.ajax({
url:
"restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),
dataType: 'json',
success:function(data){
window.archivaDevMode=data.devMode;
window.archivaJavascriptLog=data.javascriptLog;
window.archivaRuntimeInfo=data;
-
- // CacheBust is for dev purpose use false in prod env !
- var options = {
- AlwaysPreserveOrder:true,
- BasePath:"js/",
- explicit_preloading:false,
- CacheBust:window.archivaDevMode
- };
- $LAB.setGlobalDefaults(options);
- $LAB
- .script(buildLoadJsUrl("archiva/main.js"));
- }
- })
-
- });
+ require(['order!domReady','archiva/main'],function
(domReady) {
+ domReady.withResources(function () {
+ startArchivaApplication();
+ })
+ })
+ }}
+ )
+ })
});
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=1305651&r1=1305650&r2=1305651&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 22:50:42 2012
@@ -16,25 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-require(
["order!jquery","jquery_ui","jquery_cookie","bootstrap","order!archiva/search",
+define("main",["order!jquery","jquery_ui","jquery_cookie","bootstrap","order!archiva/search",
"jquery_validate","jquery_json","order!knockout","order!redback-templates","order!main-templates","order!roles",
"order!redback","general-admin","repositories","network-proxies","proxy-connectors","repository-groups"],
function() {
-
-
- // define a container object with various datas
- window.archivaModel = {};
-
- $.log("devMode:"+window.archivaDevMode);
-
- // no cache for ajax queries as we get datas from servers so preventing
caching !!
- jQuery.ajaxSetup( {
- cache: false//!window.archivaDevMode
- } );
-
-
-
/**
* reccord a cookie for session with the logged user
* @param user see user.js
@@ -337,10 +323,10 @@ function() {
.data(
"item.autocomplete", item )
.append( "<a>"
+ item.artifactId + "</a>" )
.appendTo( ul );
- };;
+ };
updateAppearanceToolBar();
}
- startArchivaApplication();
+
});
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=1305651&r1=1305650&r2=1305651&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 22:50:42 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-require(["jquery","utils"],
+define("startup",["jquery","utils"],
function() {
@@ -29,8 +29,16 @@ function() {
return srcScript+"?"+appendArchivaVersion()+"&_"+jQuery.now();
}
- $.ajaxSetup({
+
+ // define a container object with various datas
+ window.archivaModel = {};
+
+ $.log("devMode:"+window.archivaDevMode);
+
+ // no cache for ajax queries as we get datas from servers so preventing
caching !!
+ jQuery.ajaxSetup( {
+ cache: false,//!window.archivaDevMode
dataType: 'json'
- });
+ } );
});
\ No newline at end of file
