| Index: branches/wmf-deployment/skins/common/edit.js |
| — | — | @@ -29,10 +29,6 @@ |
| 30 | 30 | image.style.cursor = "pointer"; |
| 31 | 31 | image.onclick = function() { |
| 32 | 32 | insertTags(item.tagOpen, item.tagClose, item.sampleText); |
| 33 | | - //click tracking |
| 34 | | - if ( ( $j != undefined ) && ( $j.trackAction != undefined ) ) { |
| 35 | | - $j.trackAction("oldedit." + item.speedTip.replace(/ /g, "-")); |
| 36 | | - } |
| 37 | 33 | return false; |
| 38 | 34 | }; |
| 39 | 35 | |
| Property changes on: branches/wmf-deployment/skins/common/edit.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 40 | 36 | - /branches/REL1_15/phase3/skins/common/edit.js:51646 |
| /trunk/phase3/skins/common/edit.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59604 |
| 41 | 37 | + |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.js |
| — | — | @@ -4,23 +4,6 @@ |
| 5 | 5 | $.trackAction = function ( id ) { |
| 6 | 6 | $j.post( wgScriptPath + '/api.php', { 'action': 'clicktracking', 'eventid': id, 'token': wgTrackingToken } ); |
| 7 | 7 | }; |
| 8 | | - |
| 9 | | - // Clicktrack the left sidebar links |
| 10 | | - $(document).ready( function() { |
| 11 | | - $( '#p-logo a, #p-navigation a, #p-tb a' ).click( function() { |
| 12 | | - var id = 'leftnav-' + skin + '-' + |
| 13 | | - ( $(this).attr( 'id' ) || $(this).parent().attr( 'id' ) ); |
| 14 | | - var href = $(this).attr( 'href' ); |
| 15 | | - // Don't attach to javascript: URLs and the like, |
| 16 | | - // only to local URLs (start with a /), http:// , |
| 17 | | - // https:// and same-protocol URLs (start with //) |
| 18 | | - if ( href[0] == '/' || href.match( /^https?:\/\// ) ) |
| 19 | | - window.location = wgScriptPath + |
| 20 | | - '/api.php?action=clicktracking&eventid=' + |
| 21 | | - id + '&token=' + wgTrackingToken + |
| 22 | | - '&redirectto=' + escape( href ); |
| 23 | | - }); |
| 24 | | - }); |
| 25 | 8 | } |
| 26 | 9 | |
| 27 | | -})(jQuery); |
| \ No newline at end of file |
| | 10 | +})(jQuery); |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/ClickTracking/ClickTracking.php |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | /* Configuration */ |
| 21 | 21 | |
| 22 | 22 | // Increment this value when you change ClickTracking.js |
| 23 | | -$wgClickTrackingStyleVersion = 3; |
| | 23 | +$wgClickTrackingStyleVersion = 4; |
| 24 | 24 | |
| 25 | 25 | // click throttle, should be seen as "1 out of every $wgClickTrackThrottle users will have it enabled" |
| 26 | 26 | // setting this to 1 means all users will have it enabled |
| — | — | @@ -66,4 +66,4 @@ |
| 67 | 67 | |
| 68 | 68 | // Adds Internationalized Messages |
| 69 | 69 | $wgExtensionMessagesFiles['ClickTracking'] = $dir . 'ClickTracking.i18n.php'; |
| 70 | | -$wgExtensionAliasesFiles['ClickTracking'] = $dir . 'ClickTracking.alias.php'; |
| \ No newline at end of file |
| | 70 | +$wgExtensionAliasesFiles['ClickTracking'] = $dir . 'ClickTracking.alias.php'; |
| Index: branches/wmf-deployment/includes/DefaultSettings.php |
| — | — | @@ -1605,7 +1605,7 @@ |
| 1606 | 1606 | * to ensure that client-side caches do not keep obsolete copies of global |
| 1607 | 1607 | * styles. |
| 1608 | 1608 | */ |
| 1609 | | -$wgStyleVersion = '254'; |
| | 1609 | +$wgStyleVersion = '248'; |
| 1610 | 1610 | |
| 1611 | 1611 | |
| 1612 | 1612 | # Server-side caching: |
| Property changes on: branches/wmf-deployment/includes/DefaultSettings.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1613 | 1613 | - /branches/REL1_15/phase3/includes/DefaultSettings.php:51646 |
| /branches/wmf-deployment/includes/DefaultSettings.php:53381 |
| /trunk/phase3/includes/DefaultSettings.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57541,57602,57916,58151,58219,58633,58816,59607 |
| 1614 | 1614 | + |