Skip to content

Commit

Permalink
Item116: rebrand javascript class
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk@985 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Nov 26, 2008
1 parent dac205e commit f57167c
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 178 deletions.
Expand Up @@ -9,7 +9,7 @@
<script type="text/javascript">
//<![CDATA[
function openTemplateWindow () {
var window = twiki.Window.openPopup(
var window = foswiki.Window.openPopup(
"%SCRIPTURL{view}%/",
{
topic:"WebTemplateTopics",
Expand Down
2 changes: 1 addition & 1 deletion PatternSkin/pub/System/PatternSkin/pattern.js
Expand Up @@ -94,7 +94,7 @@ var patternRules = {
},
'.twikiPopUp':function(el) {
el.onclick = function() {
twiki.Window.openPopup(el.href, {template:"viewplain"});
foswiki.Window.openPopup(el.href, {template:"viewplain"});
return false;
}
},
Expand Down
2 changes: 1 addition & 1 deletion PatternSkin/templates/css.pattern.tmpl
Expand Up @@ -63,4 +63,4 @@ pre {
}
</style><![endif]-->%TMPL:END%

%TMPL:DEF{"javascriptaffectedstyle"}%<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twikiStyles.js"></script>%TMPL:END%
%TMPL:DEF{"javascriptaffectedstyle"}%<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiStyles.js"></script>%TMPL:END%
2 changes: 1 addition & 1 deletion PatternSkin/templates/foswiki.pattern.tmpl
Expand Up @@ -42,7 +42,7 @@

%TMPL:DEF{"script:skinbase"}%<!--BEHAVIOURCONTRIB--><script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/BehaviourContrib/behaviour.compressed.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikilib.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/twikiWindow.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiWindow.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiEvent.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiHTML.js"></script>
<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiCSS.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion core/pub/System/JavascriptFiles/foswiki.js
Expand Up @@ -11,7 +11,7 @@ foswikiForm.js
foswikiHTML.js
foswikiPref.js
foswikiString.js, foswikiStringUnicodeChars.js
twikiWindow.js
foswikiWindow.js
When converting to the new classes: some functions may have changed name or parameters.
Expand Down
2 changes: 1 addition & 1 deletion core/pub/System/JavascriptFiles/foswikiArray.js
Expand Up @@ -2,7 +2,7 @@
Array utility functions.
*/

if (foswiki == undefined) var foswiki = {};
var foswiki; if (foswiki == undefined) foswiki = {};
foswiki.Array = {

/**
Expand Down
2 changes: 1 addition & 1 deletion core/pub/System/JavascriptFiles/foswikiCSS.js
@@ -1,4 +1,4 @@
if (foswiki == undefined) var foswiki = {};
var foswiki; if (foswiki == undefined) foswiki = {};
foswiki.CSS = {

/**
Expand Down
2 changes: 1 addition & 1 deletion core/pub/System/JavascriptFiles/foswikiEvent.js
@@ -1,4 +1,4 @@
if (foswiki == undefined) var foswiki = {};
var foswiki; if (foswiki == undefined) foswiki = {};
foswiki.Event = {

/**
Expand Down
2 changes: 1 addition & 1 deletion core/pub/System/JavascriptFiles/foswikiForm.js
Expand Up @@ -2,7 +2,7 @@
Requires foswikiCSS.js and foswikiString.js
*/

if (foswiki == undefined) var foswiki = {};
var foswiki; if (foswiki == undefined) foswiki = {};
foswiki.Form = {

/*
Expand Down
2 changes: 1 addition & 1 deletion core/pub/System/JavascriptFiles/foswikiHTML.js
@@ -1,7 +1,7 @@
/**
HTML utility functions.
*/
if (foswiki == undefined) var foswiki = {};
var foswiki; if (foswiki == undefined) foswiki = {};
foswiki.HTML = {

/**
Expand Down
3 changes: 1 addition & 2 deletions core/pub/System/JavascriptFiles/foswikiPref.js
Expand Up @@ -10,8 +10,7 @@ Refactored for Foswiki by Arthur Clemens 2006.
/**
The preferred way for reading and writing cookies is using getPref and setPref, otherwise the limit of 20 cookies per domain is reached soon. See http://foswiki.org/Support/DataStorageInUserCookie
*/
if (foswiki == undefined) var foswiki = {};

var foswiki; if (foswiki == undefined) foswiki = {};
foswiki.Pref = {

FOSWIKI_PREF_COOKIE_NAME:"FOSWIKIPREF",
Expand Down
3 changes: 1 addition & 2 deletions core/pub/System/JavascriptFiles/foswikiString.js
@@ -1,5 +1,4 @@

if (foswiki == undefined) var foswiki = {};
var foswiki; if (foswiki == undefined) foswiki = {};
foswiki.String = {

/**
Expand Down
@@ -1,5 +1,5 @@
if (twiki == undefined) var twiki = {};
twiki.Window = {
var foswiki; if (foswiki == undefined) foswiki = {};
foswiki.Window = {

POPUP_WINDOW_WIDTH : 600,
POPUP_WINDOW_HEIGHT : 480,
Expand All @@ -23,7 +23,7 @@ twiki.Window = {
@param inAltWindow : (Window) Window where url is loaded into if no pop-up could be created. The original window contents is replaced with the passed url (plus optionally web, topic, skin path)
@use
<pre>
var window = twiki.Window.openPopup(
var window = foswiki.Window.openPopup(
"%SCRIPTURL{view}%/",
{
topic:"WebChanges",
Expand All @@ -42,9 +42,9 @@ twiki.Window = {
var windowAttributes = [];

// set default values, may be overridden below
var width = twiki.Window.POPUP_WINDOW_WIDTH;
var height = twiki.Window.POPUP_WINDOW_HEIGHT;
var attributes = twiki.Window.POPUP_ATTRIBUTES;
var width = foswiki.Window.POPUP_WINDOW_WIDTH;
var height = foswiki.Window.POPUP_WINDOW_HEIGHT;
var attributes = foswiki.Window.POPUP_ATTRIBUTES;

if (inOptions) {
var pathElements = [];
Expand Down Expand Up @@ -112,7 +112,7 @@ twiki.Window = {
function launchWindow(inWeb, inTopic) {
var scripturlpath = foswiki.getMetaTag('SCRIPTURLPATH');
var scriptsuffix = foswiki.getMetaTag('SCRIPTSUFFIX');
twiki.Window.openPopup(scripturlpath+'/view'+
foswiki.Window.openPopup(scripturlpath+'/view'+
scriptsuffix+'/',
{ web:inWeb, topic:inTopic,
template:"viewplain" } );
Expand Down
4 changes: 2 additions & 2 deletions core/pub/System/JavascriptFiles/foswikilib.js
@@ -1,5 +1,5 @@
// FosWiki namespace
if (foswiki == undefined) var foswiki = {};
// Foswiki namespace
var foswiki; if (foswiki == undefined) foswiki = {};

foswiki.getMetaTag = function(inKey) {
if (foswiki.metaTags == null || foswiki.metaTags.length == 0) {
Expand Down
155 changes: 0 additions & 155 deletions core/pub/System/JavascriptFiles/twikiString.js

This file was deleted.

0 comments on commit f57167c

Please sign in to comment.