Menu
▾
▴
[Jmol-commits] SF.net SVN: jmol:[14723] trunk/Jmol-extensions/wiki/MediaWiki
|
From: <ni...@us...> - 2010-11-28 17:48:01
|
Revision: 14723
http://jmol.svn.sourceforge.net/jmol/?rev=14723&view=rev
Author: nicove
Date: 2010-11-28 17:47:54 +0000 (Sun, 28 Nov 2010)
Log Message:
-----------
MediaWiki extension
Modified Paths:
--------------
trunk/Jmol-extensions/wiki/MediaWiki/Jmol.php
trunk/Jmol-extensions/wiki/MediaWiki/JmolMediaWiki.js
Modified: trunk/Jmol-extensions/wiki/MediaWiki/Jmol.php
===================================================================
--- trunk/Jmol-extensions/wiki/MediaWiki/Jmol.php 2010-11-28 16:54:03 UTC (rev 14722)
+++ trunk/Jmol-extensions/wiki/MediaWiki/Jmol.php 2010-11-28 17:47:54 UTC (rev 14723)
@@ -46,15 +46,17 @@
$wgAutoloadClasses['Jmol'] = "$jmolDir/Jmol.body.php";
$wgExtensionMessagesFiles['Jmol'] = "$jmolDir/Jmol.i18n.php";
+$wgJmolVersion = '3.3_dev';
+
// Bump this when updating Jmol.js or JmolMediaWiki.js to help update caches
-$wgJmolScriptVersion = '1';
+$wgJmolScriptVersion = $wgJmolVersion & '_1';
// Extension credits that will show up on Special:Version
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'Jmol',
'descriptionmsg' => 'jmol-desc',
- 'version' => '3.3_dev',
+ 'version' => $wgJmolVersion,
'author' => array( 'Nicolas Vervelle', 'Angel Herraez', 'Jmol Development Team' ),
'url' => 'http://www.mediawiki.org/wiki/Extension:Jmol',
);
Modified: trunk/Jmol-extensions/wiki/MediaWiki/JmolMediaWiki.js
===================================================================
--- trunk/Jmol-extensions/wiki/MediaWiki/JmolMediaWiki.js 2010-11-28 16:54:03 UTC (rev 14722)
+++ trunk/Jmol-extensions/wiki/MediaWiki/JmolMediaWiki.js 2010-11-28 17:47:54 UTC (rev 14723)
@@ -29,6 +29,7 @@
"left=" + windowLeft + ",top=" + windowTop ;
var s =
"<html><head>\n" +
+ "<style type='text/css'>body, html { height:100%; margin:0; padding:0; }</style>" +
"<title>" + windowTitle + "</title>\n" +
"</head><body>\n";
@@ -47,10 +48,19 @@
// window name in IE cannot contain spaces or parentheses (and windowTitle may have anything)
// Therefore, avoid "non-word" characters (i.e. other than A-Z, numbers and underscore)
var purgedTitle = windowTitle.replace(/\W/g, "_");
- var w = open("", purgedTitle, opt);
+ /* Chrome (at least, 9.0.587) has a weird behaviour in inserting applet code
+ into popup window document: the applet is not displayed.
+ The only workaround found is to open a named webpage (even if it does not exist)
+ and not to close its document.
+ This hack might be removed in future, if no longer needed for newer Chrome versions.
+ */
+ var wN = "about:blank"; //blank string is not good, it prevents setting the window title in Safari.
+ var isChrome = !(navigator.userAgent.search("Chrome")==-1);
+ if (isChrome) { wN = "dummy.html"; } //nonexistent file, but makes it work.
+ var w = open(wN, purgedTitle, opt);
w.document.open();
- w.document.write(s);
- w.document.close();
+ w.document.write(s);
+ if (!isChrome) { w.document.close(); }
w.focus();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|