diff options
| author | BeezyT <timo@ezdesign.de> | 2012-11-15 14:24:31 +0400 |
|---|---|---|
| committer | BeezyT <timo@ezdesign.de> | 2012-11-15 14:24:31 +0400 |
| commit | 979028ea9b24bd389606ab439c850d1d0e00395d (patch) | |
| tree | 8f4be443fda7c3a486dd72b70ecb85b38e0a6c65 /plugins/Transitions | |
| parent | 02932327cea7fd8746f658b6a995f10b9dba0be8 (diff) | |
refs #2465
* remember the location of the iframe in the l parameter using the core broadcast methods => popoverParam works as well => transitions and row evolution can make use of the back button
* row evolution and transitions get a static launch method that is used in overlay to trigger the popovers without any knowledge of their implementation
* broadcast.propagateAjax() gets the disableHistory parameter back but the handling is much easier this time
* remove full screen link for now because we might want to do that differently - i'll add some details to the ticket later
* two fixes for sanitized urls
git-svn-id: http://dev.piwik.org/svn/trunk@7477 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/Transitions')
| -rw-r--r-- | plugins/Transitions/API.php | 12 | ||||
| -rw-r--r-- | plugins/Transitions/templates/transitions.js | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php index 4d1a0aea8b..5b25514edf 100644 --- a/plugins/Transitions/API.php +++ b/plugins/Transitions/API.php @@ -143,8 +143,18 @@ class Piwik_Transitions_API switch ($actionType) { case 'url': + $originalActionName = $actionName; $actionName = Piwik_Common::unsanitizeInputValue($actionName); - return $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url'); + $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url'); + + if ($id < 0) + { + // an example where this is needed is urls containing < or > + $actionName = $originalActionName; + $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url'); + } + + return $id; case 'title': $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_name'); diff --git a/plugins/Transitions/templates/transitions.js b/plugins/Transitions/templates/transitions.js index 2dec90d31e..dfc4d32114 100644 --- a/plugins/Transitions/templates/transitions.js +++ b/plugins/Transitions/templates/transitions.js @@ -17,6 +17,11 @@ function DataTable_RowActions_Transitions(dataTable) { DataTable_RowActions_Transitions.prototype = new DataTable_RowAction; +/** Static helper method to launch transitions from anywhere */ +DataTable_RowActions_Transitions.launchForUrl = function(url) { + broadcast.propagateNewPopoverParameter('RowAction', 'Transitions:url:' + url); +}; + DataTable_RowActions_Transitions.isPageUrlReport = function(module, action) { return module == 'Actions' && (action == 'getPageUrls' || action == 'getEntryPageUrls' || action == 'getExitPageUrls' || action == 'getPageUrlsFollowingSiteSearch'); |