Branch 'dev' - moksha/public
by John (J5) Palmieri
moksha/public/javascript/ui/moksha.ui.grid.js | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 4c97e64e48b014ea32907dc18b6cf973f047bb20
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Thu Nov 10 16:58:46 2011 -0500
filter options kept resetting to defaults, fix that by passing in event
diff --git a/moksha/public/javascript/ui/moksha.ui.grid.js b/moksha/public/javascript/ui/moksha.ui.grid.js
index b11f59e..02ee61e 100644
--- a/moksha/public/javascript/ui/moksha.ui.grid.js
+++ b/moksha/public/javascript/ui/moksha.ui.grid.js
@@ -35,7 +35,6 @@
blankRowClass: 'moksha-grid-blank-row',
rowClass: 'moksha-grid-row',
pagerPageLimit: 5,
- filterControls: false,
more_link: null,
loading_throbber: ["Loading", // list of img urls or text
"Loading.",
@@ -188,7 +187,7 @@
// setup the search criteria
var search_criteria = {
- filters: o.filters,
+ filters: jQuery.extend(true, {}, o.filters),
start_row: start_row,
rows_per_page: rpp,
sort_key: o.sort_key,
@@ -229,7 +228,7 @@
self.options.page_num = sc.page_num;
if (typeof(sc.filters) != 'undefined')
- self.options.filters = sc.filters;
+ self.options.filters = jQuery.extend(true, self.options.filters, sc.filters);
if (typeof(sc.sort_key) != 'undefined')
self.options.sort_key = sc.sort_key;
@@ -611,12 +610,14 @@
var self = this;
var o = $grid.options;
- var onChange = function() {
- o.filters[this.name] = this.value;
+ var onChange = function(e) {
+ var filters = e.data;
+ filters[this.name] = this.value;
+ $grid.options.filters = filters;
$grid.request_data_refresh();
}
- filters.change(onChange);
+ filters.change(o.filters, onChange);
// set the defaults
$.each(filters, function (i, f) {
12 years, 6 months
Branch 'dev' - moksha/api moksha/public
by John (J5) Palmieri
moksha/api/widgets/grid.py | 14 ++++----------
moksha/public/javascript/ui/moksha.ui.grid.js | 10 ----------
2 files changed, 4 insertions(+), 20 deletions(-)
New commits:
commit 77219cf2498d4b65f744e1eea6060dc418617a91
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Thu Nov 10 13:35:34 2011 -0500
get rid of the params for showing or hiding pagers in the grid
This allowed the widget to control if a pager was shown when it was
encountered in the template. In reality it just caused confusion when
pagers wouldn't get displayed. If you want to disable a pager either
do not define one in the template or add control code there.
diff --git a/moksha/api/widgets/grid.py b/moksha/api/widgets/grid.py
index e08ac8e..5facebe 100644
--- a/moksha/api/widgets/grid.py
+++ b/moksha/api/widgets/grid.py
@@ -71,8 +71,7 @@ class TW1Grid(tw.forms.FormField):
params= ['rows_per_page', 'page_num', 'total_rows',
'filters', 'unique_key', 'sort_key', 'sort_order',
'row_template', 'resource', 'resource_path',
- 'loading_throbber', 'uid', 'more_link', 'alphaPager',
- 'numericPager', 'morePager']
+ 'loading_throbber', 'uid', 'more_link']
hidden = True # hide from the moksha main menu
rows_per_page = 10
@@ -87,9 +86,7 @@ class TW1Grid(tw.forms.FormField):
resource_path = None
loading_throbber = None
more_link = None
- alphaPager = False
- numericPager = False
- morePager = False
+
uid = None
def update_params(self, d):
@@ -121,8 +118,7 @@ class TW2Grid(tw2.forms.widgets.FormField):
params= ['rows_per_page', 'page_num', 'total_rows',
'filters', 'unique_key', 'sort_key', 'sort_order',
'row_template', 'resource', 'resource_path',
- 'loading_throbber', 'uid', 'more_link', 'alphaPager',
- 'numericPager']
+ 'loading_throbber', 'uid', 'more_link']
hidden = True # hide from the moksha main menu
id = twc.Param(default=None)
@@ -137,10 +133,8 @@ class TW2Grid(tw2.forms.widgets.FormField):
resource = twc.Param(default=None)
resource_path = twc.Param(default=None)
loading_throbber = twc.Param(default=None)
- more_link = twc.Param(default=None)
- alphaPager = twc.Param(default=False)
- numericPager = twc.Param(default=False)
uid = twc.Param(default=None)
+ more_link = twc.Param(default=None)
def prepare(self):
"""
diff --git a/moksha/public/javascript/ui/moksha.ui.grid.js b/moksha/public/javascript/ui/moksha.ui.grid.js
index b28d541..b11f59e 100644
--- a/moksha/public/javascript/ui/moksha.ui.grid.js
+++ b/moksha/public/javascript/ui/moksha.ui.grid.js
@@ -35,10 +35,7 @@
blankRowClass: 'moksha-grid-blank-row',
rowClass: 'moksha-grid-row',
pagerPageLimit: 5,
- alphaPager: false,
- numericPager: false,
filterControls: false,
- morePager: false,
more_link: null,
loading_throbber: ["Loading", // list of img urls or text
"Loading.",
@@ -737,9 +734,6 @@
processElement: function($el) {
var $grid = $el.data('grid.moksha_grid');
- if (!$grid.options.alphaPager)
- return "";
-
return this._generate_alpha_pager($grid);
},
@@ -793,8 +787,6 @@
processElement: function($el) {
var $grid = $el.data('grid.moksha_grid');
var o = $grid.options;
- if (!o.numericPager)
- return ""
return this._generate_numerical_pager($grid,
o.total_rows,
@@ -930,8 +922,6 @@
processElement: function($el) {
var $grid = $el.data('grid.moksha_grid');
var o = $grid.options;
- if (!o.morePager)
- return ""
return this._generate_more_pager ($grid,
o.total_rows,
12 years, 6 months
Branch 'dev' - moksha/public
by John (J5) Palmieri
moksha/public/javascript/moksha.extensions.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit abdee3cd963e7aefb5229472ec4ce8750c913c70
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Mon Nov 7 15:24:54 2011 -0500
point to the correct url for moksha extensions
diff --git a/moksha/public/javascript/moksha.extensions.js b/moksha/public/javascript/moksha.extensions.js
index 1acc432..de2fe39 100644
--- a/moksha/public/javascript/moksha.extensions.js
+++ b/moksha/public/javascript/moksha.extensions.js
@@ -150,7 +150,7 @@ _extensions.prototype = {
var js_script_tag = jQuery('<script />');
var attrs ={'type':'text/javascript',
- 'src': 'moksha_extension_point?' + 'exttype=' + data.type
+ 'src': moksha.url('/moksha_extension_point', {'exttype': data.type})
};
js_script_tag.attr(attrs);
12 years, 6 months
Branch 'dev' - 5 commits - moksha/api
by Luke Macken
moksha/api/widgets/amqp/amqp.py | 8 +--
moksha/api/widgets/amqp/templates/amqp.mak | 8 +--
moksha/api/widgets/global_resources/templates/global.mak | 2
moksha/api/widgets/global_resources/widget.py | 35 ++++++---------
moksha/api/widgets/grid.py | 13 +++--
moksha/api/widgets/stomp/stomp.py | 20 ++++----
moksha/api/widgets/stomp/templates/stomp.mak | 10 ++--
7 files changed, 47 insertions(+), 49 deletions(-)
New commits:
commit 5126ec395cba10eaaf5780e2821957d350720630
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Nov 2 14:23:04 2011 -0400
Some tweaks to our Grid ids
diff --git a/moksha/api/widgets/grid.py b/moksha/api/widgets/grid.py
index 0c5fc27..e08ac8e 100644
--- a/moksha/api/widgets/grid.py
+++ b/moksha/api/widgets/grid.py
@@ -90,9 +90,12 @@ class TW1Grid(tw.forms.FormField):
alphaPager = False
numericPager = False
morePager = False
+ uid = None
def update_params(self, d):
super(TW1Grid, self).update_params(d)
+ if not getattr(d,"id",None):
+ raise ValueError, "Moksha Grid is supposed to have id"
if not d.filters:
d.filters = {}
@@ -106,7 +109,7 @@ class TW1Grid(tw.forms.FormField):
grid_d[p] = v
- d['id'] += "-uuid" + str(uuid.uuid4())
+ d['id'] = self.__class__.__name__ + str(uuid.uuid4())
self.add_call(when_ready(tw.jquery.jQuery("#%s" % d['id']).mokshagrid(grid_d)))
@@ -122,6 +125,7 @@ class TW2Grid(tw2.forms.widgets.FormField):
'numericPager']
hidden = True # hide from the moksha main menu
+ id = twc.Param(default=None)
rows_per_page = twc.Param(default=10)
page_num = twc.Param(default=1)
total_rows = twc.Param(default=0)
@@ -136,8 +140,12 @@ class TW2Grid(tw2.forms.widgets.FormField):
more_link = twc.Param(default=None)
alphaPager = twc.Param(default=False)
numericPager = twc.Param(default=False)
+ uid = twc.Param(default=None)
def prepare(self):
+ """
+ Subclasses *must* call super as the last thing in their prepare() method
+ """
super(TW2Grid, self).prepare()
if not self.filters:
@@ -152,7 +160,7 @@ class TW2Grid(tw2.forms.widgets.FormField):
grid_d[p] = v
- self.id += "-uuid" + str(uuid.uuid4())
+ self.id = self.__class__.__name__ + str(uuid.uuid4())
self.add_call(when_ready(tw2.jquery.jQuery("#%s" % self.id).mokshagrid(grid_d)))
commit 06dd27f6627d701b4f784cb03b4eb014ed89f8ae
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Nov 2 14:22:06 2011 -0400
Some cleanups/optimizations to our global resource injection widget
diff --git a/moksha/api/widgets/global_resources/widget.py b/moksha/api/widgets/global_resources/widget.py
index df78122..45c2c31 100644
--- a/moksha/api/widgets/global_resources/widget.py
+++ b/moksha/api/widgets/global_resources/widget.py
@@ -97,20 +97,17 @@ class TW1GlobalResourceInjectionWidget(tw.api.Widget):
trusted_domain_hash = '{%s}' % ','.join(item_list)
self.csrf_trusted_domains_hash = trusted_domain_hash
- def update_params(self, d):
- super(TW1GlobalResourceInjectionWidget, self).update_params(d)
-
- d['base_url'] = url('/')
-
if asbool(config.get('debug')):
- d['debug'] = 'true'
+ self.debug = 'true'
if asbool(config['global_conf'].get('profile')):
- d['profile'] = 'true'
-
+ self.profile = 'true'
if asbool(config['global_conf'].get('profile.connectors')):
- d['profile_connectors'] = 'true'
+ self.profile_connectors = 'true'
+
+ def update_params(self, d):
+ super(TW1GlobalResourceInjectionWidget, self).update_params(d)
- d['csrf_trusted_domains'] = self.csrf_trusted_domains_hash
+ d['base_url'] = url('/')
identity = request.environ.get('repoze.who.identity')
if identity:
@@ -149,6 +146,13 @@ class TW2GlobalResourceInjectionWidget(twc.Widget):
def __init__(self):
super(TW2GlobalResourceInjectionWidget, self).__init__()
+ if asbool(config.get('debug')):
+ self.debug = 'true'
+ if asbool(config['global_conf'].get('profile')):
+ self.profile = 'true'
+ if asbool(config['global_conf'].get('profile.connectors')):
+ self.profile_connectors = 'true'
+
for widget_entry in pkg_resources.iter_entry_points('moksha.global'):
log.info('Loading global resource: %s' % widget_entry.name)
loaded = widget_entry.load()
@@ -184,21 +188,13 @@ class TW2GlobalResourceInjectionWidget(twc.Widget):
item_list.append('"%s": true' % domain)
trusted_domain_hash = '{%s}' % ','.join(item_list)
self.csrf_trusted_domains_hash = trusted_domain_hash
+ self.csrf_trusted_domains = self.csrf_trusted_domains_hash
def prepare(self):
super(TW2GlobalResourceInjectionWidget, self).prepare()
self.base_url = url('/')
- if asbool(config.get('debug')):
- self.debug = 'true'
- if asbool(config['global_conf'].get('profile')):
- self.profile = 'true'
- if asbool(config['global_conf'].get('profile.connectors')):
- self.profile_connectors = 'true'
-
- self.csrf_trusted_domains = self.csrf_trusted_domains_hash
-
identity = request.environ.get('repoze.who.identity')
if identity:
self.csrf_token = identity.get(self.csrf_token_id, '')
@@ -211,4 +207,3 @@ else:
GlobalResourceInjectionWidget = TW1GlobalResourceInjectionWidget
global_resources = GlobalResourceInjectionWidget()
-
commit cbf9f9a3a5e104c67d3c7ef2d4226ef0436555c3
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Nov 2 14:21:46 2011 -0400
Don't str-ify our global resource children
diff --git a/moksha/api/widgets/global_resources/templates/global.mak b/moksha/api/widgets/global_resources/templates/global.mak
index 3b1bf4f..6780b3e 100644
--- a/moksha/api/widgets/global_resources/templates/global.mak
+++ b/moksha/api/widgets/global_resources/templates/global.mak
@@ -1,6 +1,6 @@
<%namespace name="tw" module="moksha.utils.mako"/>
% for child in tw._('c'):
- ${str(child.display()) | n}
+ ${child.display() | n}
% endfor
<script type="text/javascript">
moksha_base_url = "${tw._('base_url')}";
commit e5365d35e6cab4e6020962095621820f05c39c33
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Nov 2 14:20:46 2011 -0400
Stringify some of our live socket parameters
diff --git a/moksha/api/widgets/amqp/amqp.py b/moksha/api/widgets/amqp/amqp.py
index d0ea4e3..5482846 100644
--- a/moksha/api/widgets/amqp/amqp.py
+++ b/moksha/api/widgets/amqp/amqp.py
@@ -87,14 +87,14 @@ class TW1AMQPSocket(tw.api.Widget):
def __init__(self, *args, **kw):
self.notify = asbool(config.get('moksha.socket.notify', False))
self.orbited_host = config.get('orbited_host', 'localhost')
- self.orbited_port = config.get('orbited_port', 9000)
+ self.orbited_port = str(config.get('orbited_port', 9000))
self.orbited_scheme = config.get('orbited_scheme', 'http')
self.orbited_url = '%s://%s:%s' % (
self.orbited_scheme, self.orbited_host, self.orbited_port)
self.orbited_js = tw.api.JSLink(
link=self.orbited_url + '/static/Orbited.js')
self.amqp_broker_host = config.get('amqp_broker_host', 'localhost')
- self.amqp_broker_port = config.get('amqp_broker_port', 5672)
+ self.amqp_broker_port = str(config.get('amqp_broker_port', 5672))
self.amqp_broker_user = config.get('amqp_broker_user', 'guest')
self.amqp_broker_pass = config.get('amqp_broker_pass', 'guest')
super(TW1AMQPSocket, self).__init__(*args, **kw)
@@ -135,7 +135,7 @@ class TW2AMQPSocket(twc.Widget):
orbited_host = twc.Param(
default=config.get('orbited_host', 'localhost'))
orbited_port = twc.Param(
- default=config.get('orbited_port', 9000))
+ default=str(config.get('orbited_port', 9000)))
orbited_scheme = twc.Param(
default=config.get('orbited_scheme', 'http'))
orbited_js = twc.Param(default=orbited_js)
@@ -143,7 +143,7 @@ class TW2AMQPSocket(twc.Widget):
amqp_broker_host = twc.Param(
default=config.get('amqp_broker_host', 'localhost'))
amqp_broker_port = twc.Param(
- default=config.get('amqp_broker_port', 5672))
+ default=str(config.get('amqp_broker_port', 5672)))
amqp_broker_user = twc.Param(
default=config.get('amqp_broker_user', 'guest'))
amqp_broker_pass = twc.Param(
diff --git a/moksha/api/widgets/amqp/templates/amqp.mak b/moksha/api/widgets/amqp/templates/amqp.mak
index 0728016..92cae85 100644
--- a/moksha/api/widgets/amqp/templates/amqp.mak
+++ b/moksha/api/widgets/amqp/templates/amqp.mak
@@ -43,10 +43,10 @@ if (typeof moksha_amqp_conn == 'undefined') {
Orbited.settings.streaming = true;
moksha_amqp_conn = new amqp.Connection({
% if tw._("send_hook"):
- send_hook: function(data, frame) { ${tw._("send_hook")} },
+ send_hook: function(data, frame) { ${unicode(tw._("send_hook"))} },
% endif
% if tw._("receive_hook"):
- recive_hook: function(data, frame) { ${tw._("receive_hook")} },
+ recive_hook: function(data, frame) { ${unicode(tw._("receive_hook"))} },
% endif
host: '${tw._("amqp_broker_host")}',
port: ${tw._("amqp_broker_port")},
@@ -73,7 +73,7 @@ if (typeof moksha_amqp_conn == 'undefined') {
});
% if tw._("onconnectedframe"):
- ${tw._("onconnectedframe")}
+ ${unicode(tw._("onconnectedframe"))}
moksha_amqp_queue.start();
% endif
@@ -89,7 +89,7 @@ if (typeof moksha_amqp_conn == 'undefined') {
} else {
## Utilize the existing Moksha AMQP socket connection
- ${tw._("onconnectedframe")}
+ ${unicode(tw._("onconnectedframe"))}
moksha_amqp_queue.start();
}
diff --git a/moksha/api/widgets/stomp/stomp.py b/moksha/api/widgets/stomp/stomp.py
index 652481b..669afc9 100644
--- a/moksha/api/widgets/stomp/stomp.py
+++ b/moksha/api/widgets/stomp/stomp.py
@@ -84,14 +84,14 @@ class TW1StompWidget(tw.api.Widget):
def __init__(self, *args, **kw):
self.notify = asbool(config.get('moksha.socket.notify', False))
self.orbited_host = config.get('orbited_host', 'localhost')
- self.orbited_port = config.get('orbited_port', 9000)
+ self.orbited_port = str(config.get('orbited_port', 9000))
self.orbited_scheme = config.get('orbited_scheme', 'http')
self.orbited_url = '%s://%s:%s' % (
self.orbited_scheme, self.orbited_host, self.orbited_port)
self.orbited_js = tw.api.JSLink(
link=self.orbited_url + '/static/Orbited.js')
self.stomp_host = config.get('stomp_host', 'localhost')
- self.stomp_port = config.get('stomp_port', 61613)
+ self.stomp_port = str(config.get('stomp_port', 61613))
self.stomp_user = config.get('stomp_user', 'guest')
self.stomp_pass = config.get('stomp_pass', 'guest')
super(TW1StompWidget, self).__init__(*args, **kw)
@@ -138,7 +138,7 @@ class TW2StompWidget(twc.Widget):
orbited_host = twc.Param(
default=config.get('orbited_host', 'localhost'))
orbited_port = twc.Param(
- default=config.get('orbited_port', 9000))
+ default=str(config.get('orbited_port', 9000)))
orbited_scheme = twc.Param(
default=config.get('orbited_scheme', 'http'))
orbited_js = twc.Param(default=orbited_js)
@@ -146,18 +146,18 @@ class TW2StompWidget(twc.Widget):
stomp_host = twc.Param(
default=config.get('stomp_host', 'localhost'))
stomp_port = twc.Param(
- default=config.get('stomp_port', 61613))
+ default=str(config.get('stomp_port', 61613)))
stomp_user = twc.Param(
default=config.get('stomp_user', 'guest'))
stomp_pass = twc.Param(
default=config.get('stomp_pass', 'guest'))
- onopen = twc.Param(default=twc.JSSymbol(src="function(){}"))
- onerror = twc.Param(default=twc.JSSymbol(src="function(){}"))
- onclose = twc.Param(default=twc.JSSymbol(src="function(){}"))
- onerrorframe = twc.Param(default=twc.JSSymbol(src="function(){}"))
- onmessageframe = twc.Param(default=twc.JSSymbol(src=""))
- onconnectedframe = twc.Param(default=twc.JSSymbol(src=""))
+ onopen = twc.Param(default=twc.js_callback("function(){}"))
+ onerror = twc.Param(default=twc.js_callback("function(){}"))
+ onclose = twc.Param(default=twc.js_callback("function(){}"))
+ onerrorframe = twc.Param(default=twc.js_callback("function(){}"))
+ onmessageframe = twc.Param(default='')
+ onconnectedframe = twc.Param(default='')
template = "mako:moksha.api.widgets.stomp.templates.stomp"
diff --git a/moksha/api/widgets/stomp/templates/stomp.mak b/moksha/api/widgets/stomp/templates/stomp.mak
index b5eeeb6..bb29731 100644
--- a/moksha/api/widgets/stomp/templates/stomp.mak
+++ b/moksha/api/widgets/stomp/templates/stomp.mak
@@ -28,14 +28,14 @@ if (typeof TCPSocket == 'undefined') {
function(){
## Create a new TCPSocket & Stomp client
stomp = new STOMPClient();
- stomp.onopen = ${tw._('onopen')};
- stomp.onclose = ${tw._('onclose')};
- stomp.onerror = ${tw._('onerror')};
- stomp.onerrorframe = ${tw._('onerrorframe')};
+ stomp.onopen = ${unicode(tw._('onopen'))};
+ stomp.onclose = ${unicode(tw._('onclose'))};
+ stomp.onerror = ${unicode(tw._('onerror'))};
+ stomp.onerrorframe = ${unicode(tw._('onerrorframe'))};
stomp.onconnectedframe = function(){
moksha_socket_busy = false;
$('body').triggerHandler('moksha.socket_ready');
- ${tw._('onconnectedframe')}
+ ${unicode(tw._('onconnectedframe'))}
};
stomp.onmessageframe = function(f){
var dest = f.headers.destination;
commit 17a1b7d20d95ed203f1f04c6ba91531b81b6861a
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Nov 1 23:01:17 2011 -0400
Remove an unnecessary id check in our TW2 grid widget
diff --git a/moksha/api/widgets/grid.py b/moksha/api/widgets/grid.py
index caab6f4..0c5fc27 100644
--- a/moksha/api/widgets/grid.py
+++ b/moksha/api/widgets/grid.py
@@ -93,8 +93,6 @@ class TW1Grid(tw.forms.FormField):
def update_params(self, d):
super(TW1Grid, self).update_params(d)
- if not getattr(d,"id",None):
- raise ValueError, "Moksha Grid is supposed to have id"
if not d.filters:
d.filters = {}
@@ -142,9 +140,6 @@ class TW2Grid(tw2.forms.widgets.FormField):
def prepare(self):
super(TW2Grid, self).prepare()
- if not getattr(self, 'id', None):
- raise ValueError, "Moksha Grid is supposed to have id"
-
if not self.filters:
self.filters = {}
12 years, 6 months
Branch 'dev' - 2 commits - moksha/public
by Luke Macken
moksha/public/javascript/moksha.js | 44 +++++++++++++++++++++++++++++++++----
1 file changed, 40 insertions(+), 4 deletions(-)
New commits:
commit bee9bbe934b9d3a064f6cba7ca3064b7473162fb
Merge: f9b1a2b bd3068c
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Nov 1 17:16:01 2011 -0400
Merge branch 'master' into dev
commit bd3068cee52c8683c2e510205321a5dfa9d9fb7e
Author: John (J5) Palmieri <johnp(a)redhat.com>
Date: Fri Oct 28 15:08:16 2011 -0400
add url_mask method to allow dynamic_goto to correctly rewrite url
diff --git a/moksha/public/javascript/moksha.js b/moksha/public/javascript/moksha.js
index 4f811b8..fda03ec 100644
--- a/moksha/public/javascript/moksha.js
+++ b/moksha/public/javascript/moksha.js
@@ -414,16 +414,52 @@ moksha = {
window.location.href = moksha.url(url, params);
},
+
+ // Applys a mask in the form of '/*/path' where the wild card inserts the
+ // element from the source_url.
+ //
+ // example:
+ // source_url = '/foo/bar/baz';
+ // mask = '/alpha/*/beta';
+ // url_mask(source_url, mask);
+ // > '/alpha/bar/beta'
+ url_mask: function (source_url, mask) {
+ var result = '';
+ var split_mask = mask.split('/');
+ var split_source = source_url.split('/');
+ for (var i=0; i < split_mask.length; i++) {
+ if (i >= split_source.length)
+ return result;
+
+ if (split_mask[i] == '*')
+ result += split_source[i];
+ else
+ result += split_mask[i];
+ result += '/'
+ }
+ return result;
+ },
+
/********************************************************************
- * Take a url and target, attach the csrf hash if available and load
+ * Dynamically load a portion of the page
********************************************************************/
- dynamic_goto: function(url, params) {
+ dynamic_goto: function(url, params, target, display_path) {
if (typeof(params) != 'object')
params = {}
- var new_path = moksha.url(url, params);
var current_path = location.pathname;
- window.history.pushState({}, "", moksha.url(url, params));
+ display_path = moksha.url(display_path);
+
+ var masked_url = moksha.url_mask(current_path, display_path);
+
+ window.history.pushState({}, "", masked_url);
+ function load_finish(html) {
+ $(target).html(html);
+ }
+ moksha.html_load(url, params, load_finish);
+
+ // prevent link from reloading entire page if attached to onClick handler
+ return false;
},
/*
12 years, 6 months
Branch 'dev' - moksha/api
by Luke Macken
moksha/api/widgets/global_resources/templates/global.mak | 1 +
moksha/api/widgets/global_resources/widget.py | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit f9b1a2b012691ae904c483dcad24438499d5834e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Nov 1 17:01:31 2011 -0400
Add support for profiling connectors to our TW2 global resource widget
diff --git a/moksha/api/widgets/global_resources/templates/global.mak b/moksha/api/widgets/global_resources/templates/global.mak
index d80b00c..3b1bf4f 100644
--- a/moksha/api/widgets/global_resources/templates/global.mak
+++ b/moksha/api/widgets/global_resources/templates/global.mak
@@ -9,4 +9,5 @@
moksha_userid = "${tw._('user_id')}";
moksha_debug = ${tw._('debug')};
moksha_profile = ${tw._('profile')};
+ moksha_profile_connectors = ${tw._('profile_connectors')};
</script>
diff --git a/moksha/api/widgets/global_resources/widget.py b/moksha/api/widgets/global_resources/widget.py
index b7facf1..df78122 100644
--- a/moksha/api/widgets/global_resources/widget.py
+++ b/moksha/api/widgets/global_resources/widget.py
@@ -134,12 +134,13 @@ class TW2GlobalResourceInjectionWidget(twc.Widget):
css = []
template = "mako:moksha.api.widgets.global_resources.templates.global"
- params = ['base_url', 'csrf_token', 'user_id', 'debug', 'profile', 'csrf_trusted_domains']
+ params = ['base_url', 'csrf_token', 'user_id', 'debug', 'profile', 'csrf_trusted_domains', 'profile_connectors']
base_url = '/'
csrf_token = ''
user_id = ''
debug = 'false'
profile = 'false'
+ profile_connectors = 'false'
@property
def c(self):
@@ -192,7 +193,9 @@ class TW2GlobalResourceInjectionWidget(twc.Widget):
if asbool(config.get('debug')):
self.debug = 'true'
if asbool(config['global_conf'].get('profile')):
- self.profile = true
+ self.profile = 'true'
+ if asbool(config['global_conf'].get('profile.connectors')):
+ self.profile_connectors = 'true'
self.csrf_trusted_domains = self.csrf_trusted_domains_hash
12 years, 6 months