Author: olamy
Date: Tue Jan 24 18:22:58 2012
New Revision: 1235393
URL: http://svn.apache.org/viewvc?rev=1235393&view=rev
Log:
add a timestamp on template loading to prevent browser cache when developping.
mode desactivated by default
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-tmpl.js
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/utils.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
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=1235393&r1=1235392&r2=1235393&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 Jan 24 18:22:58 2012
@@ -44,6 +44,7 @@ $.ajax(
{
url: "restServices/archivaServices/commonServices/devMode",
success:function(data){
+ window.archivaDevMode=data=='true';
require.config({
baseUrl: "js/"
});
@@ -52,7 +53,7 @@ $.ajax(
AlwaysPreserveOrder:true,
BasePath:"js/",
explicit_preloading:false,
- CacheBust:data=='true'
+ CacheBust:window.archivaDevMode
};
$LAB.setGlobalDefaults(options);
$LAB
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js?rev=1235393&r1=1235392&r2=1235393&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
Tue Jan 24 18:22:58 2012
@@ -16,8 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-require(["text!archiva/templates/menu.html","text!archiva/templates/topbar.html","text!archiva/templates/message.html",
-
"text!archiva/templates/modal.html","text!archiva/templates/grids-generics.html","text!archiva/templates/repositories.html"],
+require(["text!archiva/templates/menu.html?"+timestampNoCache(),"text!archiva/templates/topbar.html?"+timestampNoCache(),
+
"text!archiva/templates/message.html?"+timestampNoCache(),"text!archiva/templates/modal.html?"+timestampNoCache(),
+ "text!archiva/templates/grids-generics.html?"+timestampNoCache(),
+ "text!archiva/templates/repositories.html?"+timestampNoCache()],
function(menu,topbar,message,modal,grids_generics,repositories) {
// template loading
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=1235393&r1=1235392&r2=1235393&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
Tue Jan 24 18:22:58 2012
@@ -21,13 +21,17 @@ function($) {
$(function() {
+ // define a container object with various datas
+ window.archivaModel = {};
+
+ $.log("devMode:"+window.archivaDevMode);
+
// no cache for ajax queries
jQuery.ajaxSetup( {
- cache: false
+ cache: !window.archivaDevMode
} );
- // define a container object with various datas
- window.archivaModel = {};
+
/**
* reccord a cookie for session with the logged user
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=1235393&r1=1235392&r2=1235393&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 Jan 24 18:22:58 2012
@@ -295,4 +295,11 @@ customShowError=function(validator, erro
field.parents( "div.clearfix" ).addClass( "error" );
field.parent().append( "<span class=\"help-inline\">" + error.message +
"</span>" );
}
+}
+
+timestampNoCache=function(){
+ if (!window.archivaDevMode){
+ return "";
+ }
+ return "_="+jQuery.now();
}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js?rev=1235393&r1=1235392&r2=1235393&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
Tue Jan 24 18:22:58 2012
@@ -16,9 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-require(["text!redback/templates/user-edit.html",
"text!redback/templates/user-grids.html", "text!redback/templates/login.html"
- ,
"text!redback/templates/register-form.html","text!redback/templates/password-change-form.html"
-
,"text!redback/templates/user-edit-form.html","text!redback/templates/roles-tmpl.html"],
+require(["text!redback/templates/user-edit.html?"+timestampNoCache(),
"text!redback/templates/user-grids.html?"+timestampNoCache(),
+ "text!redback/templates/login.html?"+timestampNoCache(),
"text!redback/templates/register-form.html?"+timestampNoCache(),
+
"text!redback/templates/password-change-form.html?"+timestampNoCache(),
+ "text!redback/templates/user-edit-form.html?"+timestampNoCache(),
+ "text!redback/templates/roles-tmpl.html?"+timestampNoCache()],
function(useredit, usergrids,
login,register,passwordchange,usereditform,roles) {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html?rev=1235393&r1=1235392&r2=1235393&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html
Tue Jan 24 18:22:58 2012
@@ -190,14 +190,16 @@
<th>${ columnDefinition.headerText }</th>
{{/each}}
<th>${$.i18n.prop('edit')}</th>
-
</tr>
</thead>
<tbody>
{{each(i, row) itemsOnCurrentPage()}}
<tr>
{{each(j, columnDefinition) columns}}
- <td>${ typeof columnDefinition.rowText == 'function' ?
columnDefinition.rowText(row) : row[columnDefinition.rowText] }</td>
+ {{var val = (typeof columnDefinition.rowText == 'function' ?
columnDefinition.rowText(row) : row[columnDefinition.rowText])}}
+ <td id="role-description-${val}">
+ ${val}
+ </td>
{{/each}}
<td><a href="#" data-bind="click: function(){
window.redbackModel.rolesViewModel.editRole(row) }">Edit</a></td>
</tr>
