diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-08-18 10:24:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 10:24:45 +0300 |
| commit | 638dcf26e693adc0b5f639982d6d59bece32fa28 (patch) | |
| tree | c772df679c22c421c592edc62118ee71e867a1a3 | |
| parent | 5ebf5726b25d6a5af5201869637d7bf63757e6d9 (diff) | |
| parent | edc1fd5be89438b34e88d3b79a92361b7e63831d (diff) | |
Merge pull request #17 from nextcloud/backport-14-notification-primary-action-always-rightv10.0.1RC1v10.0.1
Always pull right like in the client
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | js/notification.js | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 158dd42..259bbb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ php: - 5.5 - 5.6 - 7 - - hhvm env: global: @@ -60,11 +59,6 @@ script: - sh -c "if [ '$INTEGRATION' != '1' -a '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' -a '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi" - cd ../.. - # Run Javascript unit tests -# - cd tests/js -# - sh -c "if [ '$JSTESTS' = '1' ]; then npm install --deps; node_modules/karma/bin/karma start karma.config.js --single-run; fi" -# - cd ../ - matrix: include: - php: 5.4 @@ -79,9 +73,6 @@ matrix: env: DB=mysql;CODECHECK=2 - php: 5.4 env: DB=mysql;INTEGRATION=1 -# - php: 5.4 -# env: DB=mysql;JSTESTS=1 allow_failures: - - php: hhvm - env: DB=mysql;CODECHECK=2 fast_finish: true diff --git a/js/notification.js b/js/notification.js index c71e0d0..ddbc6d2 100644 --- a/js/notification.js +++ b/js/notification.js @@ -124,7 +124,7 @@ _.each(actionsData, function(actionData) { // FIXME: use handlebars template actions.append( - '<button class="action-button' + (actionData.primary ? ' primary pull-right': '') + '" data-type="' + escapeHTML(actionData.type) + '" ' + + '<button class="action-button pull-right' + (actionData.primary ? ' primary': '') + '" data-type="' + escapeHTML(actionData.type) + '" ' + 'data-href="'+escapeHTML(actionData.link)+'">'+escapeHTML(actionData.label)+'</button>' ); // TODO create event handler on click for given action type |