Skip to content

Commit

Permalink
build v0.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sualko committed May 11, 2018
1 parent 6f00325 commit 7815ebd
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>Piwik/Matomo Tracking</name>
<summary>Track users with Piwik/Matomo</summary>
<description>Track users with Piwik/Matomo</description>
<version>0.4.0</version>
<version>0.4.1</version>
<licence>agpl</licence>
<author>Klaus Herberth</author>
<category>tools</category>
Expand Down
2 changes: 1 addition & 1 deletion build/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>Piwik/Matomo Tracking</name>
<summary>Track users with Piwik/Matomo</summary>
<description>Track users with Piwik/Matomo</description>
<version>0.4.0</version>
<version>0.4.1</version>
<licence>agpl</licence>
<author>Klaus Herberth</author>
<category>tools</category>
Expand Down
6 changes: 3 additions & 3 deletions build/css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
width: 100%;
}

#piwikSettings input {
#piwikSettings input, #piwikSettings label {
transition: background-color 0.5s;
}

#piwikSettings input.piwik-success {
#piwikSettings input.piwik-success, #piwikSettings label.piwik-success {
background-color: #4eb387;
}

#piwikSettings input.piwik-error {
#piwikSettings input.piwik-error, #piwikSettings label.piwik-error {
background-color: #f65c38;
}
4 changes: 4 additions & 0 deletions build/js/settings/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

$(function() {
function showRequestResult(element, result) {
if (element.attr('type') === 'checkbox') {
element = $('label[for="' + element.attr('id') + '"]');
}

element.removeClass('piwik-success piwik-error');
element.addClass('piwik-' + result);

Expand Down
2 changes: 1 addition & 1 deletion build/js/settings/admin.min.js

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

2 changes: 1 addition & 1 deletion build/js/settings/admin.min.js.map

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

8 changes: 4 additions & 4 deletions build/js/track.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* owncloud_piwik v0.4.0 - 2018-04-16
* owncloud_piwik v0.4.1 - 2018-05-11
*
* Copyright (c) 2018 Klaus Herberth <[email protected]> <br>
* Released under the MIT license
*
* Please see https://github.com/sualko/owncloud_piwik
*
* @author Klaus Herberth <[email protected]>
* @version 0.4.0
* @version 0.4.1
* @license MIT
*/

Expand Down Expand Up @@ -53,7 +53,7 @@ var _paq = _paq || [];
function track(options) {
var app = null;
var path = window.location.pathname;
var pathparts = path.match(/index\.php\/apps\/([a-z0-9]+)\/?/i) || path.match(/index\.php\/([a-z0-9]+)(\/([a-z0-9]+))?/i) || [];
var pathparts = path.match(/(?:index\.php\/)?apps\/([a-z0-9]+)\/?/i) || path.match(/(?:index\.php\/)?([a-z0-9]+)(\/([a-z0-9]+))?/i) || [];

if (pathparts.length >= 2) {
app = pathparts[1];
Expand Down Expand Up @@ -86,7 +86,7 @@ var _paq = _paq || [];
_paq.push(['setUserId', OC.currentUser]);
}

if (options.trackDir === 'on') {
if (options.trackDir === 'on' || options.trackDir === true) {
// track file browsing

$('#app-content').delegate('>div', 'afterChangeDirectory', function() {
Expand Down
2 changes: 1 addition & 1 deletion build/js/track.min.js

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

2 changes: 1 addition & 1 deletion build/js/track.min.js.map

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "owncloud_piwik",
"version": "0.4.0",
"version": "0.4.1",
"description": "Track owncloud/nextcloud users with piwik",
"repository": {
"type": "git",
Expand Down

0 comments on commit 7815ebd

Please sign in to comment.