setup.py
by Luke Macken
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9188b26bbbe8f91b190dba9ad6c6482bf1383955
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Mar 31 16:39:45 2010 -0400
Ok, apparely twisted doesn't provide this in their egg info?
diff --git a/setup.py b/setup.py
index 08e8bbe..9deaaa1 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ setup(
"feedparser",
"tw.jquery",
"orbited",
- "Twisted",
+ #"Twisted",
"stomper",
"Sphinx",
"Paver",
14 years, 1 month
moksha/public
by John (J5) Palmieri
moksha/public/javascript/ui/moksha.ui.tabs.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 308e5cc74be7bbbb1352dc9c1e3d96408406fc23
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Wed Mar 31 15:27:14 2010 -0400
dequeue queues so we actually show things
diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js
index 3cfe870..9cf130a 100644
--- a/moksha/public/javascript/ui/moksha.ui.tabs.js
+++ b/moksha/public/javascript/ui/moksha.ui.tabs.js
@@ -584,7 +584,7 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
this.abort();
- // no remote or from cache - just finish with callback
+ // not remote or from cache - just finish with callback
if (!url || this.element.queue("tabs").length !== 0 && !bypassCache && $.data(a, 'cache.tabs')) {
this.element.dequeue("tabs");
callback();
@@ -633,9 +633,9 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
self._cleanup();
}
- setTimeout(function() { // timeout is again required in IE, "wait" for id being restored
- self.xhr = moksha.html_load(moksha.url(url), {}, success_cb, self.$overlay_div)
- }, 0);
+
+ this.xhr = moksha.html_load(moksha.url(url), {}, success_cb, self.$overlay_div);
+ self.element.dequeue("tabs");
return this;
},
14 years, 1 month
moksha/public
by John (J5) Palmieri
moksha/public/javascript/ui/moksha.ui.tabs.js | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 939c25461ea15042e9a9a43d6118a7f3930c113d
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Mar 30 17:30:25 2010 -0400
stop click from propagating and relaoding the whole page
diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js
index 70ad108..3cfe870 100644
--- a/moksha/public/javascript/ui/moksha.ui.tabs.js
+++ b/moksha/public/javascript/ui/moksha.ui.tabs.js
@@ -464,6 +464,9 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
this.blur();
}
+ // we've handled the event so stop it from propagating
+ return false;
+
});
},
14 years, 1 month
moksha/public
by John (J5) Palmieri
moksha/public/javascript/ui/moksha.ui.tabs.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d68219fd1f2a9b1eb89c7ef32bb24090bc7197a8
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Mar 30 17:09:01 2010 -0400
fix panel exposure
diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js
index 6a7e760..70ad108 100644
--- a/moksha/public/javascript/ui/moksha.ui.tabs.js
+++ b/moksha/public/javascript/ui/moksha.ui.tabs.js
@@ -223,7 +223,7 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
o.selected = index;
}
else if (self.lis.filter('.' + o.selectedClass).length)
- o.selected = self.lis.index( self.lis.filter('.' + o.selectedClass)[0] );
+ o.selected = self.lis.index( self.lis.filter('.ui-tabs-selected')[0] );
}
o.selected = o.selected === null || o.selected !== undefined ? o.selected : first_non_static_tab; // first non-static tab selected by default
@@ -242,7 +242,7 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
this.panels.addClass('ui-tabs-hide');
this.lis.removeClass('ui-tabs-selected ui-state-active');
if (o.selected >= 0 && this.anchors.length) {
- this.panels.eq(o.selected).removeClass('ui-tabs-hide');
+ this.panels.eq(o.selected - first_non_static_tab).removeClass('ui-tabs-hide');
var l = this.lis.eq(o.selected).addClass('ui-tabs-selected ui-state-active');
var a = $('a', l)[0];
14 years, 1 month
moksha/public
by John (J5) Palmieri
moksha/public/javascript/ui/moksha.ui.popup.js | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit adc0d3d849e5115e407f2b355745147a0792f1d0
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Mar 30 15:35:57 2010 -0400
fixes for the popup to work with the new jQuery ui widget class
* s/_init/_create
* s/defaults/options
diff --git a/moksha/public/javascript/ui/moksha.ui.popup.js b/moksha/public/javascript/ui/moksha.ui.popup.js
index 07b68b2..117b74e 100644
--- a/moksha/public/javascript/ui/moksha.ui.popup.js
+++ b/moksha/public/javascript/ui/moksha.ui.popup.js
@@ -28,8 +28,17 @@
*/
(function ($) {
$.widget("ui.moksha_popup", {
-
- _init: function() {
+ options: {
+ popupClass: 'ui-moksha-popup',
+ popupItemsClass: 'ui-moksha-popup-items',
+ selectedClass: 'ui-moksha-selected',
+ panelClass: 'ui-moksha-popup-panel',
+ hoverTimeout: 500,
+ triggerEvent: 'hover',
+ fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
+ },
+
+ _create: function() {
// create popup
this._createpopup();
},
@@ -130,16 +139,7 @@ $.widget("ui.moksha_popup", {
});
$.extend($.ui.moksha_popup, {
- version: '@VERSION',
- defaults: {
- popupClass: 'ui-moksha-popup',
- popupItemsClass: 'ui-moksha-popup-items',
- selectedClass: 'ui-moksha-selected',
- panelClass: 'ui-moksha-popup-panel',
- hoverTimeout: 500,
- triggerEvent: 'hover',
- fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
- }
+ version: '@VERSION'
});
14 years, 1 month
moksha/public
by John (J5) Palmieri
moksha/public/javascript/ui/moksha.ui.grid.js | 58 +++++++++++++-------------
1 file changed, 29 insertions(+), 29 deletions(-)
New commits:
commit c75ee9141a1813fba55f9af8b086bbabeda02121
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Mar 30 15:33:32 2010 -0400
updated for the new jQuery UI widget class
* s/_init/_create
* s/defaults/options
diff --git a/moksha/public/javascript/ui/moksha.ui.grid.js b/moksha/public/javascript/ui/moksha.ui.grid.js
index 2a54af5..ecbc64f 100644
--- a/moksha/public/javascript/ui/moksha.ui.grid.js
+++ b/moksha/public/javascript/ui/moksha.ui.grid.js
@@ -18,8 +18,35 @@
$.widget("ui.mokshagrid",{
controls: function(){},
/* methods */
+ options: {
+ event: 'click',
+ rows_per_page: 10,
+ page_num: 1,
+ total_rows: 0,
+ first_visible_row: 1, // 1 based index
+ last_visible_row: 1, // 1 based index
+ visible_rows: 0,
+ filters: {},
+ unique_key: undefined,
+ sort_key: undefined,
+ sort_order: -1,
+ row_template: null,
+ resource: null,
+ resource_path: null,
+ blankRowClass: 'moksha-grid-blank-row',
+ rowClass: 'moksha-grid-row',
+ pagerPageLimit: 5,
+ alphaPager: false,
+ numericPager: false,
+ filterControls: false,
+ more_link: null,
+ loading_throbber: ["Loading", // list of img urls or text
+ "Loading.",
+ "Loading..",
+ "Loading..."]
+ },
- _init: function() {
+ _create: function() {
var self = this;
var o = self.options;
@@ -538,34 +565,7 @@
$.extend($.ui.mokshagrid, {
version: '@VERSION',
- getters: 'visible_row_count',
- defaults: {
- event: 'click',
- rows_per_page: 10,
- page_num: 1,
- total_rows: 0,
- first_visible_row: 1, // 1 based index
- last_visible_row: 1, // 1 based index
- visible_rows: 0,
- filters: {},
- unique_key: undefined,
- sort_key: undefined,
- sort_order: -1,
- row_template: null,
- resource: null,
- resource_path: null,
- blankRowClass: 'moksha-grid-blank-row',
- rowClass: 'moksha-grid-row',
- pagerPageLimit: 5,
- alphaPager: false,
- numericPager: false,
- filterControls: false,
- more_link: null,
- loading_throbber: ["Loading", // list of img urls or text
- "Loading.",
- "Loading..",
- "Loading..."]
- }
+ getters: 'visible_row_count'
});
$.ui.mokshagrid.prototype.controls.filter = {
14 years, 1 month
moksha/public
by John (J5) Palmieri
moksha/public/javascript/ui/moksha.ui.tabs.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 954a1c9d376dab07e447f40a67a1afc3beaad7fe
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Tue Mar 30 14:26:10 2010 -0400
correctly select the tab to show
diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js
index f53aed8..6a7e760 100644
--- a/moksha/public/javascript/ui/moksha.ui.tabs.js
+++ b/moksha/public/javascript/ui/moksha.ui.tabs.js
@@ -251,7 +251,6 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
moksha.update_title(title, 1);
//var $show = $($(a).data('dynamic_href.tabs') + ':first', self.element)
- //$show.show().removeClass(o.hideClass); // use show and remove class to show in any case no matter how it has been hidden before
// seems to be expected behavior that the show callback is fired
self.element.queue("tabs", function() {
@@ -386,7 +385,7 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
return true;
var el = this, $li = $(this).closest('li'), $hide = self.panels.filter(':not(.ui-tabs-hide)'),
- $show = $(self._sanitizeSelector(this.hash));
+ $show = $($(this).data('dynamic_href.tabs') + ':first', self.element);
// If tab is already selected and not collapsible or tab disabled or
// or is already loading or click callback returns false stop here.
14 years, 1 month
moksha/public
by John (J5) Palmieri
moksha/public/javascript/ui/moksha.ui.tabs.js | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 1c83a02ea2cf4df3d67556ab83a785f6ebe2d1db
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Mon Mar 29 17:34:01 2010 -0400
remove event bind that was preventing links from loading
diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js
index f023857..f53aed8 100644
--- a/moksha/public/javascript/ui/moksha.ui.tabs.js
+++ b/moksha/public/javascript/ui/moksha.ui.tabs.js
@@ -467,9 +467,6 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
});
- // disable click in any case
- this.anchors.bind('click.tabs', function(){return false;});
-
},
add: function(url, label, index) {
if (index == undefined)
14 years, 1 month
moksha/public
by John (J5) Palmieri
moksha/public/javascript/ui/moksha.ui.tabs.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1ba8eaf55a0cb6f32a1fd26d090d02ec98ba717b
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Mon Mar 29 15:30:42 2010 -0400
typo s/slef/self
diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js
index 92a178c..f023857 100644
--- a/moksha/public/javascript/ui/moksha.ui.tabs.js
+++ b/moksha/public/javascript/ui/moksha.ui.tabs.js
@@ -614,7 +614,7 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
var $stripped = moksha.filter_resources(r);
$panel.html($stripped);
- slef._cleanup();
+ self._cleanup();
if (o.cache)
$.data(a, 'cache.tabs', true); // if loaded once do not load them again
14 years, 1 month
moksha/public
by John (J5) Palmieri
moksha/public/javascript/ui/moksha.ui.tabs.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 7e66dc24668d25d53e35d2feca8dfcb485728637
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Mon Mar 29 15:22:31 2010 -0400
spinners in jquery.ui require a span, wrap the label in a span if doesn't exist
diff --git a/moksha/public/javascript/ui/moksha.ui.tabs.js b/moksha/public/javascript/ui/moksha.ui.tabs.js
index 4a7295c..92a178c 100644
--- a/moksha/public/javascript/ui/moksha.ui.tabs.js
+++ b/moksha/public/javascript/ui/moksha.ui.tabs.js
@@ -35,7 +35,7 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
container_level: 0,
// Ajax
- spinner: 'Loading…',
+ spinner: '<em>Loading…</em>',
cache: false,
idPrefix: 'ui-tabs-',
ajaxOptions: {},
@@ -601,9 +601,11 @@ $.widget("ui.mokshatabs", $.ui.tabs, {
};
if (o.spinner) {
- var label = inner(a).html();
- inner(a).wrapInner('<em></em>')
- .find('em').data('label.tabs', label).html(o.spinner);
+ var span = $('span', a);
+ if (span.length == 0)
+ span = inner(a).wrapInner('<span></span>').find('span');
+
+ span.data('label.tabs', span.html()).html(o.spinner);
}
var success_cb = function(r, s) {
14 years, 1 month