Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mattab committed Apr 2, 2013
2 parents 9c69774 + 089b7df commit a05bd7b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ matrix:
script: ./travis.sh

before_script:
- echo `date`
- mysql -e 'create database piwik_test;'
- ./tests/travis/prepare.sh
- ./tests/travis/setup_webserver.sh
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Piwik is the leading Free/Libre open source Web Analytics software.

Piwik is a full featured PHP MySQL software program that you download and install on your own webserver.
Piwik is a full featured PHP MySQL software program that you download and install on your own webserver.
At the end of the five minute installation process you will be given a JavaScript code.
Simply copy and paste this tag on websites you wish to track and access your analytics reports in real time.

Expand Down
7 changes: 6 additions & 1 deletion plugins/CoreHome/templates/popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ var Piwik_Popover = (function () {
}
});

// override the undocumented _title function to ensure that the title attribute is not escaped (according to jQueryUI bug #6016)
container.data( "uiDialog" )._title = function(title) {
title.html( this.options.title );
};

isOpen = true;
};

Expand Down Expand Up @@ -124,7 +129,7 @@ var Piwik_Popover = (function () {

/** Set the title of the popover */
setTitle: function (titleHtml) {
container.dialog({title: titleHtml});
container.dialog('option', 'title', titleHtml);
},

/** Set inner HTML of the popover */
Expand Down
2 changes: 1 addition & 1 deletion plugins/Dashboard/templates/dashboardWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@

var currentWidget = this.element;
$('body').on('click.dashboardWidget', function (ev) {
if (ev.target.className == "ui-widget-overlay") {
if (/ui-widget-overlay/.test(ev.target.className)) {
$(currentWidget).dialog("close");
}
});
Expand Down

0 comments on commit a05bd7b

Please sign in to comment.