Author: ssthkjer
Date: 2007-05-23 15:29:32 +0200 (Wed, 23 May 2007)
New Revision: 5154
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTab.java
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTabFactory.java
Log:
javascript inclusion is now set with attribute javascript in view.xml
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTab.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTab.java
2007-05-23 12:40:55 UTC (rev 5153)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTab.java
2007-05-23 13:29:32 UTC (rev 5154)
@@ -138,6 +138,11 @@
* Holds value of property css.
*/
private final List<String> css = new ArrayList<String>();
+
+ /**
+ * Holds value of property javascript.
+ */
+ private final List<String> javascript = new ArrayList<String>();
/**
* Holds value of property layout.
@@ -167,6 +172,7 @@
final int adLimit,
final int adOnTop,
final List<String> css,
+ final List<String> javascript,
final boolean absoluteOrdering,
final boolean executeOnBlank,
final Layout layout){
@@ -201,6 +207,7 @@
}
this.rssResultName = rssResultName;
this.css.addAll(css);
+ this.javascript.addAll(javascript);
this.absoluteOrdering = absoluteOrdering;
this.executeOnBlank = executeOnBlank;
this.rssHidden = rssHidden;
@@ -473,6 +480,14 @@
public List<String> getCss() {
return Collections.unmodifiableList(css);
}
+
+ /**
+ * Getter for property javascript.
+ * @return Value of property javascript.
+ */
+ public List<String> getJavascript() {
+ return Collections.unmodifiableList(javascript);
+ }
/**
* Getter for property layout.
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTabFactory.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTabFactory.java
2007-05-23 12:40:55 UTC (rev 5153)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/view/config/SearchTabFactory.java
2007-05-23 13:29:32 UTC (rev 5154)
@@ -241,7 +241,8 @@
inherit != null ? inherit.getAdCommand() : "");
final String allCss = parseString(tabE.getAttribute("css"),
null);
final String[] css = allCss != null ? allCss.split(",") : new
String[]{};
-
+ final String allJavascript =
parseString(tabE.getAttribute("javascript"), null);
+ final String[] javascript = allJavascript != null ?
allJavascript.split(",") : new String[]{};
// enrichment hints
final NodeList enrichmentNodeList =
tabE.getElementsByTagName("enrichment");
final Collection<SearchTab.EnrichmentHint> enrichments = new
ArrayList<SearchTab.EnrichmentHint>();
@@ -328,6 +329,7 @@
parseInt(tabE.getAttribute("ad-limit"), inherit !=
null ? inherit.getAdLimit() : -1),
parseInt(tabE.getAttribute("ad-on-top"), inherit !=
null ? inherit.getAdOnTop() : -1),
Arrays.asList(css),
+ Arrays.asList(javascript),
parseBoolean(tabE.getAttribute("absolute-ordering"),
inherit != null
? inherit.isAbsoluteOrdering()
: false),
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
