From kupu-checkins at codespeak.net Thu Jan 13 03:38:48 2011
From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net)
Date: Thu, 13 Jan 2011 03:38:48 +0100 (CET)
Subject: kupu-checkins@codespeak.net VIAGRA ® Official -88%
Message-ID: <20110113023848.0BBF3282BE7@codespeak.net>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20110113/275002eb/attachment.htm
From mihxil at codespeak.net Tue Jan 25 15:59:09 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Tue, 25 Jan 2011 15:59:09 +0100 (CET)
Subject: [kupu-checkins] r80239 - kupu/trunk/kupu/mmbase/tools
Message-ID: <20110125145909.3AB892A2004@codespeak.net>
Author: mihxil
Date: Tue Jan 25 15:59:06 2011
New Revision: 80239
Modified:
kupu/trunk/kupu/mmbase/tools/searchrelate.jspx
Log:
it seems that find(+div) does not work any more with newest jquery
Modified: kupu/trunk/kupu/mmbase/tools/searchrelate.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/tools/searchrelate.jspx (original)
+++ kupu/trunk/kupu/mmbase/tools/searchrelate.jspx Tue Jan 25 15:59:06 2011
@@ -70,26 +70,27 @@
+ $(document).ready(function() {
+ $('#mm_searchrelate h1').each(function() {
+ $(this).siblings("div").css("display", "none");
+ $(this).click(function() {
+ var h1 = this;
+ $(this).siblings("div").each(function() {
+ var c = $(this).css("display");
+ $(this).css("display", c == 'none' ? 'block' : 'none');
+ if (c == 'none') {
+ $(h1).addClass("kupu-toolbox-heading-opened");
+ $(h1).removeClass("kupu-toolbox-heading-closed");
+ } else {
+ $(h1).addClass("kupu-toolbox-heading-closed");
+ $(h1).removeClass("kupu-toolbox-heading-opened");
+ }
+ });
+ });
+ });
+ });
+
+
From mihxil at codespeak.net Tue Jan 25 16:00:21 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Tue, 25 Jan 2011 16:00:21 +0100 (CET)
Subject: [kupu-checkins] r80240 - kupu/trunk/kupu/common
Message-ID: <20110125150021.23E252A2004@codespeak.net>
Author: mihxil
Date: Tue Jan 25 16:00:19 2011
New Revision: 80240
Modified:
kupu/trunk/kupu/common/kupueditor.js
Log:
This makes it possbile to upgrade sarissa
Modified: kupu/trunk/kupu/common/kupueditor.js
==============================================================================
--- kupu/trunk/kupu/common/kupueditor.js (original)
+++ kupu/trunk/kupu/common/kupueditor.js Tue Jan 25 16:00:19 2011
@@ -19,6 +19,9 @@
XXX Is this overkill?
*/
+// this makes it possbible to upgrade sarissa.
+_SARISSA_IS_IE = _SARISSA_IS_IE || Sarissa._SARISSA_IS_IE;
+_SARISSA_IS_MOZ = _SARISSA_IS_MOZ || Sarissa._SARISSA_IS_MOZ;
function KupuDocument(iframe) {
/* Model */
From mihxil at codespeak.net Tue Jan 25 17:27:08 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Tue, 25 Jan 2011 17:27:08 +0100 (CET)
Subject: [kupu-checkins] r80241 - kupu/trunk/kupu/mmbase
Message-ID: <20110125162708.008CA2A2004@codespeak.net>
Author: mihxil
Date: Tue Jan 25 17:27:06 2011
New Revision: 80241
Modified:
kupu/trunk/kupu/mmbase/Makefile
Log:
actually needs bash
Modified: kupu/trunk/kupu/mmbase/Makefile
==============================================================================
--- kupu/trunk/kupu/mmbase/Makefile (original)
+++ kupu/trunk/kupu/mmbase/Makefile Tue Jan 25 17:27:06 2011
@@ -1,5 +1,5 @@
# $Id$
-
+SHELL=/bin/bash
KUPU_HOME=..
XSLTPROC = /usr/bin/env xsltproc
From mihxil at codespeak.net Thu Jan 27 06:38:20 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 27 Jan 2011 06:38:20 +0100 (CET)
Subject: [kupu-checkins] r80244 - kupu/trunk/kupu/common
Message-ID: <20110127053820.BE39E2A2008@codespeak.net>
Author: mihxil
Date: Thu Jan 27 06:38:17 2011
New Revision: 80244
Modified:
kupu/trunk/kupu/common/kuputoolcollapser.js
Log:
made it possible to override the cookie age and path
Modified: kupu/trunk/kupu/common/kuputoolcollapser.js
==============================================================================
--- kupu/trunk/kupu/common/kuputoolcollapser.js (original)
+++ kupu/trunk/kupu/common/kuputoolcollapser.js Thu Jan 27 06:38:17 2011
@@ -84,6 +84,9 @@
return currchild;
};
+ // 100 years before state is lost... should be enough ;)
+ ToolCollapser.prototype.COOKIE_AGE = (100 * 365 * 24 * 60 * 60 * 1000);
+ ToolCollapser.prototype.COOKIE_PATH = '/';
ToolCollapser.prototype.saveState = function() {
/* save collapse state of the toolboxes in a cookie */
if (!navigator.cookieEnabled) {
@@ -100,13 +103,13 @@
};
var exp = new Date();
- // 100 years before state is lost... should be enough ;)
- exp.setTime(exp.getTime() + (100 * 365 * 24 * 60 * 60 * 1000));
+
+ exp.setTime(exp.getTime() + ToolCollapser.prototype.COOKIE_AGE);
var cookie = 'initial_state=' +
escape(this.serializeMapping(current_state)) +
';' +
'expires=' + exp.toGMTString() + ';' +
- 'path=/';
+ 'path=' + ToolCollapser.prototype.COOKIE_PATH;
document.cookie = cookie;
};
From mihxil at codespeak.net Thu Jan 27 06:38:55 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 27 Jan 2011 06:38:55 +0100 (CET)
Subject: [kupu-checkins] r80245 - kupu/trunk/kupu/mmbase
Message-ID: <20110127053855.6B68D2A2008@codespeak.net>
Author: mihxil
Date: Thu Jan 27 06:38:53 2011
New Revision: 80245
Modified:
kupu/trunk/kupu/mmbase/mmbase.js
Log:
drawertool was registered twice
Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js (original)
+++ kupu/trunk/kupu/mmbase/mmbase.js Thu Jan 27 06:38:53 2011
@@ -90,7 +90,7 @@
var child = toolboxes.childNodes[i];
if (child.className == 'kupu-toolbox') {
var heading = child.getElementsByTagName('h1')[0];
- addEventHandler(heading, 'click', function() { layout.adjustToolBoxes() });
+ addEventHandler(heading, 'click', function() { layout.adjustToolBoxes(); });
};
};
if (kupu.getBrowserName() == 'IE') {
From mihxil at codespeak.net Thu Jan 27 06:39:38 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 27 Jan 2011 06:39:38 +0100 (CET)
Subject: [kupu-checkins] r80246 - kupu/trunk/kupu/mmbase
Message-ID: <20110127053938.F023B2A2008@codespeak.net>
Author: mihxil
Date: Thu Jan 27 06:39:37 2011
New Revision: 80246
Modified:
kupu/trunk/kupu/mmbase/kupuinit.js
Log:
drawertool was registered twice
Modified: kupu/trunk/kupu/mmbase/kupuinit.js
==============================================================================
--- kupu/trunk/kupu/mmbase/kupuinit.js (original)
+++ kupu/trunk/kupu/mmbase/kupuinit.js Thu Jan 27 06:39:37 2011
@@ -165,11 +165,6 @@
var zoom = new KupuZoomTool('kupu-zoom-button');
kupu.registerTool('zoomtool', zoom);
- // create some drawers, drawers are some sort of popups that appear when a
- // toolbar button is clicked
- var drawertool = new DrawerTool();
- kupu.registerTool('drawertool', drawertool);
-
/*
var sourceedittool = new SourceEditTool('kupu-source-button', 'kupu-editor-textarea');
kupu.registerTool('sourceedittool', sourceedittool);
@@ -202,8 +197,8 @@
kupu.registerTool('drawertool', drawertool);
drawertool.search = function() {
- alert('haaai');
- }
+ // alert('haaai');
+ };
try {
var linklibdrawer = new ResourceLibraryDrawer(linktool,
From mihxil at codespeak.net Thu Jan 27 06:48:07 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 27 Jan 2011 06:48:07 +0100 (CET)
Subject: [kupu-checkins] r80247 - kupu/trunk/kupu/mmbase
Message-ID: <20110127054807.D0AEF2A2008@codespeak.net>
Author: mihxil
Date: Thu Jan 27 06:48:06 2011
New Revision: 80247
Modified:
kupu/trunk/kupu/mmbase/head.kupu
kupu/trunk/kupu/mmbase/mmbase.js
Log:
more precise cookie path, to avoid sending the cookie to all other files on the server too
Modified: kupu/trunk/kupu/mmbase/head.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/head.kupu (original)
+++ kupu/trunk/kupu/mmbase/head.kupu Thu Jan 27 06:48:06 2011
@@ -21,7 +21,7 @@
- ../common
+
@@ -54,6 +54,7 @@
+
Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js (original)
+++ kupu/trunk/kupu/mmbase/mmbase.js Thu Jan 27 06:48:06 2011
@@ -34,6 +34,7 @@
var layout = new Layouter();
function startKupu(language) {
+ document.cookie = 'initial_state=;expires=1296020719075;path=/'; // expire the cookies on / which we used to set
// first let's load the message catalog
// if there's no global 'i18n_message_catalog' variable available, don't
// try to load any translations
From mihxil at codespeak.net Thu Jan 27 07:25:16 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Thu, 27 Jan 2011 07:25:16 +0100 (CET)
Subject: [kupu-checkins] r80248 - kupu/trunk/kupu/mmbase
Message-ID: <20110127062516.970F72A2008@codespeak.net>
Author: mihxil
Date: Thu Jan 27 07:25:15 2011
New Revision: 80248
Modified:
kupu/trunk/kupu/mmbase/html.kupu
Log:
limit path of cookie
Modified: kupu/trunk/kupu/mmbase/html.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/html.kupu (original)
+++ kupu/trunk/kupu/mmbase/html.kupu Thu Jan 27 07:25:15 2011
@@ -27,7 +27,7 @@
client
-
+
((java.util.Locale)locale).getLanguage()
From mihxil at codespeak.net Mon Jan 31 12:29:39 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Mon, 31 Jan 2011 12:29:39 +0100 (CET)
Subject: [kupu-checkins] r80260 - kupu/trunk/kupu/mmbase
Message-ID: <20110131112939.903A7282B9D@codespeak.net>
Author: mihxil
Date: Mon Jan 31 12:29:36 2011
New Revision: 80260
Modified:
kupu/trunk/kupu/mmbase/Makefile
Log:
add svn version to the build for easier checking what version is actually installed
Modified: kupu/trunk/kupu/mmbase/Makefile
==============================================================================
--- kupu/trunk/kupu/mmbase/Makefile (original)
+++ kupu/trunk/kupu/mmbase/Makefile Mon Jan 31 12:29:36 2011
@@ -74,6 +74,7 @@
cp -rpf drawers build/mmbase/kupu/mmbase
cp -rpf icons build/mmbase/kupu/mmbase
cp -rpf ../common build/mmbase/kupu
+ svn info > build/mmbase/kupu/version
mkdir -p build/WEB-INF/lib
cp $(HOME)/.m2/repository/org/oscom/kupu-i18n/$(VERSION)/kupu-i18n-$(VERSION).jar build/WEB-INF/lib
cp $(HOME)/.m2/repository/org/oscom/mmbase-kupu-i18n/$(VERSION)/mmbase-kupu-i18n-$(VERSION).jar build/WEB-INF/lib