Skip to content

Commit

Permalink
Item8209:
Browse files Browse the repository at this point in the history
   * fixed multiple internet exploder problems
   * fixed tabpane showing first tab by name 
   * fixed Config.spec for new =configure=



git-svn-id: http://svn.foswiki.org/trunk@4411 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Jul 3, 2009
1 parent 7e33cb6 commit 6e3f5c4
Show file tree
Hide file tree
Showing 13 changed files with 40 additions and 22 deletions.
2 changes: 1 addition & 1 deletion JQueryPlugin/data/System/JQueryPlugin.txt
Expand Up @@ -155,7 +155,7 @@ reduce bandwidth and speed up interactive performance.

---++ Plugin Roadmap
for v2.1:
* create formfield types for colors, user, topic, web
* create formfield types for user, topic, web
* replace jquery.nifty with [[http://www.malsup.com/jquery/corner/][jquery.corner]]

for v2.2:
Expand Down
2 changes: 1 addition & 1 deletion JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
Expand Up @@ -30,7 +30,7 @@ use vars qw(


$VERSION = '$Rev: 3740 $';
$RELEASE = '2.01';
$RELEASE = '2.02';
$SHORTDESCRIPTION = 'jQuery <nop>JavaScript library for Foswiki';
$NO_PREFS_IN_TOPIC = 1;

Expand Down
9 changes: 5 additions & 4 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Config.spec
@@ -1,13 +1,14 @@
# ---+ JQueryPlugin

# ---+ Extensions
# ---++ JQueryPlugin
# ---+++ General settings
# **BOOLEAN**
$Foswiki::cfg{JQueryPlugin}{Debug} = 0;

# **BOOLEAN**
$Foswiki::cfg{JQueryPlugin}{MemoryCache} = 1;

# **BOOLEAN**
# Enable this switch to prevent name conflicts with other javascrit frameworks that
# Enable this switch to prevent name conflicts with other javascript frameworks that
# use <code>$</code>. If enabled <code>$</code> will be renamed to <code>$j</code>.
# To jQuery plugin authors: in any case try to wrap your plugins into a
# <pre>(function($) { ... })(jQuery);</pre> construct to make use of <code>$</code> locally.
Expand All @@ -22,7 +23,7 @@ $Foswiki::cfg{JQueryPlugin}{JQueryVersion} = 'jquery-1.3.2';
# **SELECT base, lightness, redmond, smoothness**
$Foswiki::cfg{JQueryPlugin}{JQueryTheme} = 'redmond';

# ---++ jQuery plugins
# ---+++ jQuery plugins -- EXPERT
# **BOOLEAN**
$Foswiki::cfg{JQueryPlugin}{Plugins}{Autocomplete}{Enabled} = 1;

Expand Down
6 changes: 3 additions & 3 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/TABPANE.pm
Expand Up @@ -118,10 +118,10 @@ sub handleTab {
my $afterLoadHandler = $params->{afterload} || '';
my $url = $params->{url} || '';
my $container = $params->{container} || '';
my $tabId = $params->{id};
my $tabClass = $params->{id} || '';
my $height = $params->{height};
my $width = $params->{width};
$tabId = 'jqTab'.Foswiki::Plugins::JQueryPlugin::Plugins::getRandom();
my $tabId = 'jqTab'.Foswiki::Plugins::JQueryPlugin::Plugins::getRandom();

my @metaData = ();
if ($beforeHandler) {
Expand Down Expand Up @@ -150,7 +150,7 @@ sub handleTab {
$style = "style='$style'" if $style;


return "<!-- TAB --><div id='$tabId' class=\"jqTab$metaData\">\n<h2 >$theName</h2>\n<div class='jqTabContents' $style>";
return "<!-- TAB --><div id='$tabId' class=\"$tabClass jqTab$metaData\">\n<h2 >$theName</h2>\n<div class='jqTabContents' $style>";
}

=begin TML
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Expand Up @@ -9,27 +9,37 @@
display:none; /* switched on by plugin */
border:1px solid #BDBEC5;
clear:both;
padding:0px;
margin:0px;
}
.jqTab.current {
display:block;
}
.jqTabContents {
padding:8px;
/*
overflow-x:hidden;
overflow-y:auto;
*/
}
ul.jqTabGroup {
margin:0px !important;
padding:0px !important;
list-style:none;
padding-top:1px !important; /* IE6+IE7 fix */
display:block;
_padding-top:1px !important; /* IE6 fix */
}
*:first-child+html
ul.jqTabGroup { /* IE7 fix */
padding-top:2px !important;
}
*:first-child+html
.jqTabPane .foswikiClear { /* IE7 fix to draw the borders */
display:none;
}
.jqTabPane .foswikiClear {
_display:none; /* IE6 Fix */
}
ul.jqTabGroup li {
background-color: transparent;
background-image: url('tab_right.png') !important;
_background-image: url('tab_right.gif') !important; /* IE 6 */
_background-image: url('tab_right.gif') !important; /* IE6 */
background-repeat: no-repeat !important;
background-position: right top !important;
float:left;
Expand All @@ -47,7 +57,7 @@ ul.jqTabGroup a {
white-space:nowrap;
background-color:transparent !important;
background-image: url('tab_left.png') !important;
_background-image: url('tab_left.gif') !important; /* IE 6 */
_background-image: url('tab_left.gif') !important; /* IE6 */
background-repeat:no-repeat !important;
background-position:left top !important;
color:black;
Expand Down
Expand Up @@ -33,6 +33,9 @@ $.tabpane = {

var $thisPane = $(this);
var thisOpts = $.extend({}, opts, $thisPane.metadata());
if ($.browser.msie) {
thisOpts.animate = false; // force animation off on all msies because that fucks up font aliasing
}

if (!$thisPane.is(".jqTabPaneInitialized")) {

Expand All @@ -46,9 +49,10 @@ $.tabpane = {
// get all headings and create tabs
var index = 1;
$thisPane.find("> .jqTab").each(function() {
var title = $(this).find('h2:first').remove().text();
var $this = $(this);
var title = $this.find('h2:first').remove().text();
$tabGroup.append('<li><a href="#" data="'+this.id+'">'+title+'</a></li>');
if (index == thisOpts.select || this.id == thisOpts.select) {
if (index == thisOpts.select || $this.hasClass(thisOpts.select)) {
thisOpts.currentTabId = this.id;
}
index++;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Expand Up @@ -252,7 +252,7 @@
onClear: undefined,
onReset: undefined,
onSelect: undefined,
onDeselect: undefined,
onDeselect: undefined
};

})(jQuery);

0 comments on commit 6e3f5c4

Please sign in to comment.