diff --git a/trunk/NatSkin/templates/javascript.nat.tmpl b/trunk/NatSkin/templates/javascript.nat.tmpl
index bdf2fa2..61fe759 100755
--- a/trunk/NatSkin/templates/javascript.nat.tmpl
+++ b/trunk/NatSkin/templates/javascript.nat.tmpl
@@ -10,5 +10,11 @@
%TMPL:DEF{"initAutoComplete"}%<meta name='foswiki.NatSkin.initAutocomplete' content='true' />%TMPL:END%
%TMPL:DEF{"initSearchBox"}%<meta name='foswiki.NatSkin.initSearchBox' content='true' />%TMPL:END%
%TMPL:DEF{"initRedDot"}%<meta name='foswiki.NatSkin.initRedDot' content='true' />%TMPL:END%
+%TMPL:DEF{"javascript"}%%TMPL:P{"meta:preferences"}%%TMPL:P{"script"}%%TMPL:P{"defaultjavascript"}%%TMPL:END%
-%TMPL:DEF{"javascript"}%%TMPL:P{"defaultjavascript"}%%TMPL:END%
+%TMPL:DEF{"meta:preferences"}%%FOREACH{"%EXPORTEDPREFERENCES%"
+ format="<meta name='foswiki.$topic' content='$percnt$topic$percnt' />"
+ separator="
+"
+}%
+%TMPL:END%
diff --git a/trunk/NatSkin/pub/System/NatSkin/natskin.uncompressed.js b/trunk/NatSkin/pub/System/NatSkin/natskin.u
index a5f2b87..0f43e38 100644
--- a/trunk/NatSkin/pub/System/NatSkin/natskin.uncompressed.js
+++ b/trunk/NatSkin/pub/System/NatSkin/natskin.uncompressed.js
@@ -2,7 +2,34 @@
// document ready
(function($) {$(function() {
-
+ var myPreferences =[
+ 'NatSkin.initWebButtons',
+ 'NatSkin.initOverflows',
+ 'NatSkin.initTopicActions',
+ 'NatSkin.initSideBar',
+ 'NatSkin.initRedDot',
+ 'NatSkin.initAutocomplete',
+ 'NatSkin.initSearchBox',
+ 'NatSkin.fixRevisionPosition'
+ ];
+
+ if (typeof(foswiki.getPreference) === 'function') {
+ $.each(myPreferences,
+ function (index, element) {
+ foswiki.getPreference(element);
+ }
+ );
+ } else {
+ if (typeof(foswiki) === 'object' && typeof(foswiki.preferences) === 'undefined') {
+ foswiki.preferences = [];
+ }
+ $.each(myPreferences,
+ function (index, element) {
+ foswiki.preferences[element] = foswiki[element];
+ }
+ );
+ }
+
/* ie6 png transperency fix for img tags */
if ($.browser.msie && $.browser.version < 7) {
window.setTimeout(function() {
@@ -16,13 +43,13 @@
"height": height,
"filter": "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + img.attr("src") + "', sizingMeth
});
- img.attr("src", foswiki.pubUrlPath+"/"+foswiki.systemWebName+"/NatSkin/blank.gif");
+ img.attr("src", foswiki.preferences['PUBURLPATH']+"/"+foswiki.preferences['SYSTEMWEB']+"/NatSkin/blank.gi
});
}, 10);
}
/* move revinfo */
- if (foswiki.NatSkin.fixRevisionPosition) {
+ if (foswiki.preferences['NatSkin.fixRevisionPosition']) {
var target = $(".natMain h1:first");
if (target.length) {
$(".natRevision").remove().insertAfter(target);
@@ -30,7 +57,7 @@
}
/* horiz menu */
- if (foswiki.NatSkin.initWebButtons) {
+ if (foswiki.preferences['NatSkin.initWebButtons']) {
var $container = $(".natWebButtonsContents");
$container.children("ul").superfish({
autoArrows: false
@@ -39,13 +66,13 @@
}
/* add overflow div for tables */
- if (foswiki.NatSkin.initOverflows) {
+ if (foswiki.preferences['NatSkin.initOverflows']) {
$(".natMainContents .foswikiTable")
.not($(".foswikiTable .foswikiTable", this))
.wrap("<div class='overflow foswikiTableOverflow'></div>");
}
- if (foswiki.NatSkin.initTopicActions) { // topicaction tooltips
+ if (foswiki.preferences['NatSkin.initTopicActions']) { // topicaction tooltips
var $tipContainer = $("#natTopicActionTooltip");
var $topicActions = $("#natTopicActions");
//$tipContainer.width($topicActions.width());
@@ -104,7 +131,7 @@
});
}
- if (foswiki.NatSkin.initSideBar) { // typographic improvements in sidebar
+ if (foswiki.preferences['NatSkin.initSideBar']) { // typographic improvements in sidebar
$('.natSideBar h2 + h2').not(".jqInited").each(function() {
var $this = $(this);
$this.addClass('.jqInited');
@@ -112,7 +139,7 @@