Skip to content

Commit

Permalink
Item116: rebrand javascript classes
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.foswiki.org/trunk@984 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Nov 26, 2008
1 parent 20943b1 commit dac205e
Show file tree
Hide file tree
Showing 23 changed files with 126 additions and 129 deletions.
2 changes: 1 addition & 1 deletion JSCalendarContrib/data/System/JSCalendarContribInline.txt
View file
@@ -1,4 +1,4 @@
Inline include of JSCalendarContrib HTML for use in forms.
%STARTINCLUDE%
<style type='text/css' media='all'>@import url('%PUBURLPATH%/%SYSTEMWEB%/JSCalendarContrib/calendar-blue.css');.calendar {z-index:2000;}</style><script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JSCalendarContrib/calendar.js'></script><script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JSCalendarContrib/lang/calendar-en.js'></script><script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JSCalendarContrib/calendar-setup.js'></script><script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JSCalendarContrib/twiki.js'></script>
<style type='text/css' media='all'>@import url('%PUBURLPATH%/%SYSTEMWEB%/JSCalendarContrib/calendar-blue.css');.calendar {z-index:2000;}</style><script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JSCalendarContrib/calendar.js'></script><script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JSCalendarContrib/lang/calendar-en.js'></script><script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JSCalendarContrib/calendar-setup.js'></script><script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JSCalendarContrib/foswiki.js'></script>
%STOPINCLUDE%
0 ...rib/pub/System/JSCalendarContrib/twiki.js → ...b/pub/System/JSCalendarContrib/foswiki.js
View file
File renamed without changes.
0 ...pub/System/JSCalendarContrib/twiki_src.js → ...b/System/JSCalendarContrib/foswiki_src.js
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions PatternSkin/pub/System/PatternSkin/pattern_edit.js
View file
Expand Up @@ -14,7 +14,7 @@ Pattern.Edit = {
buttons:{"font":null,"enlarge":null, "shrink":null},

setFontStyleState:function(el, inShouldUpdateEditBox, inButtonState) {
var pref = twiki.Pref.getPref(Pattern.Edit.EDIT_PREF_NAME + Pattern.Edit.EDITBOX_PREF_FONTSTYLE_ID);
var pref = foswiki.Pref.getPref(Pattern.Edit.EDIT_PREF_NAME + Pattern.Edit.EDITBOX_PREF_FONTSTYLE_ID);

if (!pref || (pref != Pattern.Edit.EDITBOX_FONTSTYLE_PROPORTIONAL && pref != Pattern.Edit.EDITBOX_FONTSTYLE_MONO)) pref = Pattern.Edit.EDITBOX_FONTSTYLE_PROPORTIONAL;

Expand Down Expand Up @@ -45,12 +45,12 @@ Pattern.Edit = {
setEditBoxFontStyle:function(inFontStyle) {
if (inFontStyle == Pattern.Edit.EDITBOX_FONTSTYLE_MONO) {
foswiki.CSS.replaceClass(document.getElementById(EDITBOX_ID), EDITBOX_FONTSTYLE_PROPORTIONAL_STYLE, EDITBOX_FONTSTYLE_MONO_STYLE);
twiki.Pref.setPref(PREF_NAME + Pattern.Edit.EDITBOX_PREF_FONTSTYLE_ID, inFontStyle);
foswiki.Pref.setPref(PREF_NAME + Pattern.Edit.EDITBOX_PREF_FONTSTYLE_ID, inFontStyle);
return;
}
if (inFontStyle == Pattern.Edit.EDITBOX_FONTSTYLE_PROPORTIONAL) {
foswiki.CSS.replaceClass(document.getElementById(EDITBOX_ID), EDITBOX_FONTSTYLE_MONO_STYLE, EDITBOX_FONTSTYLE_PROPORTIONAL_STYLE);
twiki.Pref.setPref(PREF_NAME + Pattern.Edit.EDITBOX_PREF_FONTSTYLE_ID, inFontStyle);
foswiki.Pref.setPref(PREF_NAME + Pattern.Edit.EDITBOX_PREF_FONTSTYLE_ID, inFontStyle);
return;
}
},
Expand Down
2 changes: 1 addition & 1 deletion PatternSkin/templates/edit.pattern.tmpl
View file
Expand Up @@ -5,7 +5,7 @@

%TMPL:DEF{"script:skintemplate"}%%IF{"not context TinyMCEPluginEnabled or $nowysiwyg='1'" then='$percntTMPL:P{\"script:skintemplate:edit\"}$percnt'}%%TMPL:END%

%TMPL:DEF{"script:skintemplate:edit"}%<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twikiPref.js"></script>
%TMPL:DEF{"script:skintemplate:edit"}%<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiPref.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswiki_edit.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/PatternSkin/pattern_edit.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion PatternSkin/templates/settings.pattern.tmpl
View file
@@ -1,6 +1,6 @@
%TMPL:INCLUDE{"settings"}%

%TMPL:DEF{"script:skintemplate"}%<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twikiPref.js"></script>
%TMPL:DEF{"script:skintemplate"}%<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiPref.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswiki_edit.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/PatternSkin/pattern_edit.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion PatternSkin/templates/view.pattern.tmpl
View file
Expand Up @@ -8,7 +8,7 @@

%TMPL:DEF{"script:skintemplate"}%%IF{"defined raw" then='%TMPL:P{"script:skintemplate:viewraw"}%'}%%TMPL:END%

%TMPL:DEF{"script:skintemplate:viewraw"}%<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twikiPref.js"></script>
%TMPL:DEF{"script:skintemplate:viewraw"}%<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiPref.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswiki_edit.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/PatternSkin/pattern_edit.js"></script>%TMPL:END%

Expand Down
2 changes: 1 addition & 1 deletion RenderFormPlugin/lib/TWiki/Plugins/RenderFormPlugin.pm
View file
Expand Up @@ -43,7 +43,7 @@ sub commonTagsHandler {
$_[0] =~ s/\%RENDERFORM{(.*?)}\%/TWiki::Plugins::RenderFormPlugin::Core::render($1,$_[1],$_[2])/ge;
$_[0] =~ s/\%STARTRENDERFORMLAYOUT(.*?)STOPRENDERFORMLAYOUT\%//sg;
### workaround for date fields:
$_[0] =~ s/<\/body>/%INCLUDE{"%SYSTEMWEB%\/JSCalendarContribInline"}%<\/body>/i if ($TWiki::Plugins::VERSION > 1.1) && ($_[0] !~ /JSCalendarContrib\twiki.js/);
$_[0] =~ s/<\/body>/%INCLUDE{"%SYSTEMWEB%\/JSCalendarContribInline"}%<\/body>/i if ($TWiki::Plugins::VERSION > 1.1) && ($_[0] !~ /JSCalendarContrib\foswiki.js/);
##};
##TWiki::Func::writeWarning($@) if $@;
}
4 changes: 2 additions & 2 deletions TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm
View file
Expand Up @@ -160,8 +160,8 @@ HERE
Foswiki::Func::addToHEAD('tinyMCE', <<SCRIPT);
<meta name="TINYMCEPLUGIN_INIT" content="$metainit" />
<script language="javascript" type="text/javascript" src="$tmceURL/tiny_mce$USE_SRC.js"></script>
<script language="javascript" type="text/javascript" src="$pluginURL/twiki_tiny$USE_SRC.js"></script>
<script language="javascript" type="text/javascript" src="$pluginURL/twiki$USE_SRC.js"></script>
<script language="javascript" type="text/javascript" src="$pluginURL/foswiki_tiny$USE_SRC.js"></script>
<script language="javascript" type="text/javascript" src="$pluginURL/foswiki$USE_SRC.js"></script>
SCRIPT

# See %SYSTEMWEB%.IfStatements for a description of this context id.
Expand Down
0 ...in/pub/System/TinyMCEPlugin/twiki_tiny.js → .../pub/System/TinyMCEPlugin/foswiki_tiny.js
View file
File renamed without changes.
0 ...ub/System/TinyMCEPlugin/twiki_tiny_src.js → .../System/TinyMCEPlugin/foswiki_tiny_src.js
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions TinyMCEPlugin/pub/System/TinyMCEPlugin/twiki.js
View file
Expand Up @@ -4,11 +4,11 @@ function initTextAreaStyles(){var iframe=document.getElementById(IFRAME_ID);if(i
break;}
node=node.parentNode;}}
function handleKeyDown(e){if(!e)e=window.event;var code;if(e.keyCode)code=e.keyCode;if(code==27)return false;return true;}
function validateMandatoryFields(event){if(twiki.Pref.validateSuppressed){return true;}
function validateMandatoryFields(event){if(foswiki.Pref.validateSuppressed){return true;}
var ok=true;var els=twiki.getElementsByClassName(document,'select','twikiMandatory');for(var j=0;j<els.length;j++){var one=false;for(var k=0;k<els[j].options.length;k++){if(els[j].options[k].selected){one=true;break;}}
if(!one){alert("The required form field '"+els[j].name+
"' has no value.");ok=false;}}
var taglist=new Array('input','textarea');for(var i=0;i<taglist.length;i++){els=twiki.getElementsByClassName(document,taglist[i],'twikiMandatory');for(var j=0;j<els.length;j++){if(els[j].value==null||els[j].value.length==0){alert("The required form field '"+els[j].name+
"' has no value.");ok=false;}}}
return ok;}
function suppressSaveValidation(){twiki.Pref.validateSuppressed=true;}
function suppressSaveValidation(){foswiki.Pref.validateSuppressed=true;}
4 changes: 2 additions & 2 deletions TinyMCEPlugin/pub/System/TinyMCEPlugin/twiki_src.js
View file
Expand Up @@ -81,7 +81,7 @@ Provided for use by editors that need to validate form elements before
navigating away. Duplicated from JavascriptFiles/foswiki_edit.js to resolve Item5514
*/
function validateMandatoryFields(event) {
if (twiki.Pref.validateSuppressed) {
if (foswiki.Pref.validateSuppressed) {
return true;
}
var ok = true;
Expand Down Expand Up @@ -122,5 +122,5 @@ button is pressed (i.e. call this n 'Cancel').
Duplicated from JavascriptFiles/foswiki_edit.js to resolve Item5514
*/
function suppressSaveValidation() {
twiki.Pref.validateSuppressed = true;
foswiki.Pref.validateSuppressed = true;
}
2 changes: 1 addition & 1 deletion TwistyPlugin/lib/Foswiki/Plugins/TwistyPlugin.pm
View file
Expand Up @@ -112,7 +112,7 @@ sub _addHeader {
</style>
<script type='text/javascript' src='%PUBURL%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js'></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiPref.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiPref.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiCSS.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TwistyContrib/twist.compressed.js"></script>
<script type="text/javascript">
Expand Down
81 changes: 40 additions & 41 deletions TwistyPlugin/pub/System/TwistyPlugin/twistie.dojo.js
View file
Expand Up @@ -6,9 +6,8 @@ http://alex.dojotoolkit.org/shrinksafe/
/**
Singleton class.
*/
var twiki;
if (!twiki) twiki = {};
twiki.TwistyPlugin = new function () {
var foswiki; if (!foswiki) foswiki = {};
foswiki.TwistyPlugin = new function () {

var self = this;

Expand Down Expand Up @@ -45,14 +44,14 @@ twiki.TwistyPlugin = new function () {
*/
this._toggleTwisty = function (ref) {
if (!ref) return;
ref.state = (ref.state == twiki.TwistyPlugin.CONTENT_HIDDEN) ? twiki.TwistyPlugin.CONTENT_SHOWN : twiki.TwistyPlugin.CONTENT_HIDDEN;
ref.state = (ref.state == foswiki.TwistyPlugin.CONTENT_HIDDEN) ? foswiki.TwistyPlugin.CONTENT_SHOWN : foswiki.TwistyPlugin.CONTENT_HIDDEN;
self._update(ref, true);
}

/**
Updates the states of UI trinity 'show', 'hide' and 'content'.
Saves new state in a cookie if one of the elements has CSS class 'twistyRememberSetting'.
@param ref : (Object) twiki.TwistyPlugin.Storage object
@param ref : (Object) foswiki.TwistyPlugin.Storage object
@privileged
*/
this._update = function (ref, inMaySave) {
Expand All @@ -66,7 +65,7 @@ twiki.TwistyPlugin = new function () {
//dojo.anim("thinger", { width: 500, height: 500 }, 500);


if (ref.state == twiki.TwistyPlugin.CONTENT_SHOWN) {
if (ref.state == foswiki.TwistyPlugin.CONTENT_SHOWN) {

// show content

Expand All @@ -90,13 +89,13 @@ twiki.TwistyPlugin = new function () {

if (inMaySave && ref.saveSetting) {

twiki.Pref.setPref(twiki.TwistyPlugin.COOKIE_PREFIX + ref.name, ref.state);
foswiki.Pref.setPref(foswiki.TwistyPlugin.COOKIE_PREFIX + ref.name, ref.state);

}

if (ref.clearSetting) {

twiki.Pref.setPref(twiki.TwistyPlugin.COOKIE_PREFIX + ref.name, "");
foswiki.Pref.setPref(foswiki.TwistyPlugin.COOKIE_PREFIX + ref.name, "");

}
}
Expand All @@ -111,7 +110,7 @@ twiki.TwistyPlugin = new function () {
var name = self._getName(e);
var ref = self._storage[name];
if (!ref) {
ref = new twiki.TwistyPlugin.Storage();
ref = new foswiki.TwistyPlugin.Storage();
}
var classValue = dojo.attr(e, 'class'); //TODO: replace with dojo.hasClass
ref.saveSetting = dojo.hasClass(e, 'twistyRememberSetting');
Expand All @@ -138,7 +137,7 @@ twiki.TwistyPlugin = new function () {
}

/**
Key-value set of twiki.TwistyPlugin.Storage objects. The value is accessed by twisty id identifier name.
Key-value set of foswiki.TwistyPlugin.Storage objects. The value is accessed by twisty id identifier name.
@example var ref = self._storage["demo"];
@privileged
*/
Expand All @@ -148,23 +147,23 @@ twiki.TwistyPlugin = new function () {
/**
Public constants.
*/
twiki.TwistyPlugin.CONTENT_HIDDEN = 0;
twiki.TwistyPlugin.CONTENT_SHOWN = 1;
twiki.TwistyPlugin.COOKIE_PREFIX = "TwistyPlugin_";
foswiki.TwistyPlugin.CONTENT_HIDDEN = 0;
foswiki.TwistyPlugin.CONTENT_SHOWN = 1;
foswiki.TwistyPlugin.COOKIE_PREFIX = "TwistyPlugin_";

/**
The cached full TWiki cookie string so the data has to be read only once during init.
The cached full Foswiki preference cookie string so the data has to be read only once during init.
*/
twiki.TwistyPlugin.prefList;
foswiki.TwistyPlugin.prefList;

/**
Initializes a twisty HTML element (either show control, hide control or content 'toggle') by registering and setting the visible state.
Calls _register() and _update().
@public
@param inId : (String) id of HTMLElement
@return The stored twiki.TwistyPlugin.Storage object.
@return The stored foswiki.TwistyPlugin.Storage object.
*/
twiki.TwistyPlugin.init = function(e) {
foswiki.TwistyPlugin.init = function(e) {
if (!e) return;

// check if already inited
Expand All @@ -191,56 +190,56 @@ twiki.TwistyPlugin.init = function(e) {
// all Twisty elements present

if (dojo.hasClass(e, 'twistyInited1')) {
ref.state = twiki.TwistyPlugin.CONTENT_SHOWN
ref.state = foswiki.TwistyPlugin.CONTENT_SHOWN
this._update(ref, false);
return ref;
}
if (dojo.hasClass(e, 'twistyInited0')) {
ref.state = twiki.TwistyPlugin.CONTENT_HIDDEN
ref.state = foswiki.TwistyPlugin.CONTENT_HIDDEN
this._update(ref, false);
return ref;
}

if (twiki.TwistyPlugin.prefList == null) {
if (foswiki.TwistyPlugin.prefList == null) {
// cache complete cookie string
twiki.TwistyPlugin.prefList = twiki.Pref.getPrefList();
foswiki.TwistyPlugin.prefList = foswiki.Pref.getPrefList();
}
var cookie = twiki.Pref.getPrefValueFromPrefList(twiki.TwistyPlugin.COOKIE_PREFIX + ref.name, twiki.TwistyPlugin.prefList);
if (ref.firstStartHidden) ref.state = twiki.TwistyPlugin.CONTENT_HIDDEN;
if (ref.firstStartShown) ref.state = twiki.TwistyPlugin.CONTENT_SHOWN;
var cookie = foswiki.Pref.getPrefValueFromPrefList(foswiki.TwistyPlugin.COOKIE_PREFIX + ref.name, foswiki.TwistyPlugin.prefList);
if (ref.firstStartHidden) ref.state = foswiki.TwistyPlugin.CONTENT_HIDDEN;
if (ref.firstStartShown) ref.state = foswiki.TwistyPlugin.CONTENT_SHOWN;
// cookie setting may override firstStartHidden and firstStartShown
if (cookie && cookie == "0") ref.state = twiki.TwistyPlugin.CONTENT_HIDDEN;
if (cookie && cookie == "1") ref.state = twiki.TwistyPlugin.CONTENT_SHOWN;
if (cookie && cookie == "0") ref.state = foswiki.TwistyPlugin.CONTENT_HIDDEN;
if (cookie && cookie == "1") ref.state = foswiki.TwistyPlugin.CONTENT_SHOWN;
// startHidden and startShown may override cookie
if (ref.startHidden) ref.state = twiki.TwistyPlugin.CONTENT_HIDDEN;
if (ref.startShown) ref.state = twiki.TwistyPlugin.CONTENT_SHOWN;
if (ref.startHidden) ref.state = foswiki.TwistyPlugin.CONTENT_HIDDEN;
if (ref.startShown) ref.state = foswiki.TwistyPlugin.CONTENT_SHOWN;

this._update(ref, false);
}
return ref;
}

twiki.TwistyPlugin.toggleAll = function(inState) {
foswiki.TwistyPlugin.toggleAll = function(inState) {
var i;
for (var i in this._storage) {
var e = this._storage[i];
e.state = inState;
this._update(e, true);
}
}
twiki.TwistyPlugin.toggleAll_Show = function() {
twiki.TwistyPlugin.toggleAll(twiki.TwistyPlugin.CONTENT_SHOWN);
foswiki.TwistyPlugin.toggleAll_Show = function() {
foswiki.TwistyPlugin.toggleAll(foswiki.TwistyPlugin.CONTENT_SHOWN);
}
twiki.TwistyPlugin.toggleAll_Hide = function() {
twiki.TwistyPlugin.toggleAll(twiki.TwistyPlugin.CONTENT_HIDDEN);
foswiki.TwistyPlugin.toggleAll_Hide = function() {
foswiki.TwistyPlugin.toggleAll(foswiki.TwistyPlugin.CONTENT_HIDDEN);
}

/**
Storage container for properties of a twisty HTML element: show control, hide control or toggle content.
*/
twiki.TwistyPlugin.Storage = function () {
foswiki.TwistyPlugin.Storage = function () {
this.name; // String
this.state = twiki.TwistyPlugin.CONTENT_HIDDEN; // Number
this.state = foswiki.TwistyPlugin.CONTENT_HIDDEN; // Number
this.hide; // HTMLElement
this.show; // HTMLElement
this.toggle; // HTMLElement (content element)
Expand All @@ -255,13 +254,13 @@ twiki.TwistyPlugin.Storage = function () {
/**
* dojo init
*/
twiki.TwistyPlugin.onLoad = function() {
dojo.query(".twistyTrigger").forEach("twiki.TwistyPlugin.init(item);");
dojo.query(".twistyContent").forEach("twiki.TwistyPlugin.init(item);");
foswiki.TwistyPlugin.onLoad = function() {
dojo.query(".twistyTrigger").forEach("foswiki.TwistyPlugin.init(item);");
dojo.query(".twistyContent").forEach("foswiki.TwistyPlugin.init(item);");

dojo.query(".twistyExpandAll").onclick(twiki.TwistyPlugin.toggleAll_Show);
dojo.query(".twistyCollapseAll").onclick(twiki.TwistyPlugin.toggleAll_Hide);
dojo.query(".twistyExpandAll").onclick(foswiki.TwistyPlugin.toggleAll_Show);
dojo.query(".twistyCollapseAll").onclick(foswiki.TwistyPlugin.toggleAll_Hide);
}

dojo.addOnLoad(twiki.TwistyPlugin.onLoad);
dojo.addOnLoad(foswiki.TwistyPlugin.onLoad);

8 changes: 4 additions & 4 deletions TwistyPlugin/pub/System/TwistyPlugin/twistie.jquery.js
View file
Expand Up @@ -82,10 +82,10 @@ twiki.JQueryTwistyPlugin = new function () {
$(contentElem).addClass("twistyHidden");
}
if (inMaySave && ref.saveSetting) {
twiki.Pref.setPref(twiki.JQueryTwistyPlugin.COOKIE_PREFIX + ref.name, ref.state);
foswiki.Pref.setPref(twiki.JQueryTwistyPlugin.COOKIE_PREFIX + ref.name, ref.state);
}
if (ref.clearSetting) {
twiki.Pref.setPref(twiki.JQueryTwistyPlugin.COOKIE_PREFIX + ref.name, "");
foswiki.Pref.setPref(twiki.JQueryTwistyPlugin.COOKIE_PREFIX + ref.name, "");
}
}

Expand Down Expand Up @@ -186,9 +186,9 @@ twiki.JQueryTwistyPlugin.init = function(e) {

if (twiki.JQueryTwistyPlugin.prefList == null) {
// cache complete cookie string
twiki.JQueryTwistyPlugin.prefList = twiki.Pref.getPrefList();
twiki.JQueryTwistyPlugin.prefList = foswiki.Pref.getPrefList();
}
var cookie = twiki.Pref.getPrefValueFromPrefList(twiki.JQueryTwistyPlugin.COOKIE_PREFIX + ref.name, twiki.JQueryTwistyPlugin.prefList);
var cookie = foswiki.Pref.getPrefValueFromPrefList(twiki.JQueryTwistyPlugin.COOKIE_PREFIX + ref.name, twiki.JQueryTwistyPlugin.prefList);
if (ref.firstStartHidden) ref.state = twiki.JQueryTwistyPlugin.CONTENT_HIDDEN;
if (ref.firstStartShown) ref.state = twiki.JQueryTwistyPlugin.CONTENT_SHOWN;
// cookie setting may override firstStartHidden and firstStartShown
Expand Down
2 changes: 1 addition & 1 deletion TwistyPlugin/templates/twistyplugin.dojo.tmpl
View file
Expand Up @@ -11,7 +11,7 @@
</style
-->
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/DojoToolkitContrib/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiPref.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiPref.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/TwistyPlugin/twistie.dojo.js"></script>
<script type="text/javascript">
// <![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion TwistyPlugin/templates/twistyplugin.jquery.tmpl
View file
Expand Up @@ -6,7 +6,7 @@
@import url("%PUBURL%/%SYSTEMWEB%/TwistyPlugin/twistie.jquery.css");
</style>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TwistyPlugin/twistie.jquery.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiPref.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiPref.js"></script>
<script type="text/javascript">
// <![CDATA[
var styleText = '<style type="text/css" media="all">.twikiMakeVisible{display:inline;}.twikiMakeVisibleInline{display:inline;}.twikiMakeVisibleBlock{display:block;}.twikiMakeHidden{display:none;}</style>';
Expand Down
2 changes: 1 addition & 1 deletion TwistyPlugin/templates/twistyplugin.tmpl
View file
Expand Up @@ -6,7 +6,7 @@
</style>
<script type='text/javascript' src='%PUBURL%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js'></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/twikiPref.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiPref.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/JavascriptFiles/foswikiCSS.js"></script>
<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/TwistyContrib/twist.compressed.js"></script>
<script type="text/javascript">
Expand Down

0 comments on commit dac205e

Please sign in to comment.