Commit 4ca44fc272b68a25667fb325a067e5a6bfc8d63d
Exists in
master
and in
1 other branch
merge
Showing 3 changed files Side-by-side Diff
scripts/FlashcardDirective.js
View file @
4ca44fc
| ... | ... | @@ -9,10 +9,10 @@ |
| 9 | 9 | flashcard: '=flashcardObj', // flashcard-obj in parent html |
| 10 | 10 | refresh: '&' // eval refresh in parent html |
| 11 | 11 | }, |
| 12 | - link: function(scope, element) { | |
| 13 | - $('.tooltipped').tooltip(); | |
| 14 | - /* Handles width of the card */ | |
| 15 | - } | |
| 12 | + //link: function(scope, element) { | |
| 13 | + // $('.tooltipped').tooltip(); | |
| 14 | + // /* Handles width of the card */ | |
| 15 | + //} | |
| 16 | 16 | }; |
| 17 | 17 | } |
| 18 | 18 | ); |
scripts/SettingsController.js
View file @
4ca44fc
| ... | ... | @@ -30,6 +30,9 @@ |
| 30 | 30 | console.log("gonna try to launch service worker now"); |
| 31 | 31 | if ('serviceWorker' in navigator) { |
| 32 | 32 | navigator.serviceWorker.register('scripts/service-worker.js').then( |
| 33 | + | |
| 34 | + console.log('gonna try to launch service worker now'); | |
| 35 | + navigator.serviceWorker.register('scripts/service-worker.js').then( | |
| 33 | 36 | function(serviceWorkerRegistration) { |
| 34 | 37 | serviceWorkerRegistration.pushManager.subscribe().then( |
| 35 | 38 | function(pushSubscription) { |
| ... | ... | @@ -54,4 +57,7 @@ |
| 54 | 57 | |
| 55 | 58 | |
| 56 | 59 | }); |
| 60 | +======= | |
| 61 | + }); | |
| 62 | +>>>>>>> 4331bd151446a1d95043bd61d557e08fbdd78ff5 |
templates/flashcard.html
View file @
4ca44fc
| 1 | -<div class="card flashy smallify black-text text-darken-2" ng-init="startShrink = false" | |
| 2 | - ng-class="{'shrinky': startShrink, 'in-deck':flashcard.isInDeck()}"> | |
| 1 | +<div class="card flashy smallify black-text text-darken-2" | |
| 2 | + ng-class="{'in-deck':flashcard.isInDeck()}"> | |
| 3 | 3 | <div class="valign-wrapper"> |
| 4 | 4 | <div class="card-content valign center-align" ng-bind-html="flashcard.formatted_text"></div> |
| 5 | 5 | </div> |