diff options
| -rw-r--r-- | templates/web/fixmybarangay/header.html | 12 | ||||
| -rw-r--r-- | templates/web/fixmybarangay/report/_message_manager.html | 6 | ||||
| -rw-r--r-- | web/cobrands/fixmybarangay/message_manager_client.js | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/templates/web/fixmybarangay/header.html b/templates/web/fixmybarangay/header.html index 2557a26cb..77ddcc638 100644 --- a/templates/web/fixmybarangay/header.html +++ b/templates/web/fixmybarangay/header.html @@ -25,10 +25,14 @@ [% allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_council); %] [% IF allow_creation %] - - <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> - <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> - + <script> + Modernizr.load({ + test: window.btoa && window.atob, + nope: '/cobrands/fixmybarangay/base64.min.js' + }); + </script> + <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> <script src="[% version('/cobrands/fixmybarangay/message_manager_client.js') %]" charset="utf-8"></script> <script> $(document).ready(function() { diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html index 51437ff02..41544a754 100644 --- a/templates/web/fixmybarangay/report/_message_manager.html +++ b/templates/web/fixmybarangay/report/_message_manager.html @@ -34,12 +34,6 @@ </ul> <script type="text/javascript"> - -yepnope({ - test: window.btoa && window.atob, - nope: '/cobrands/fixmybarangay/base64.js', - callback: function () {} // `btoa` now safe to use (for IE) -}) $(document).ready(function() { var $mm_message_list = $('#mm-message-list'); diff --git a/web/cobrands/fixmybarangay/message_manager_client.js b/web/cobrands/fixmybarangay/message_manager_client.js index fa04063c8..eb9d8c925 100644 --- a/web/cobrands/fixmybarangay/message_manager_client.js +++ b/web/cobrands/fixmybarangay/message_manager_client.js @@ -136,7 +136,7 @@ var message_manager = (function() { // btoa doesn't work on all browers? var make_base_auth = function(user, password) { var tok = user + ':' + password; - var hash = btoa(tok); + var hash = window.btoa(tok); return "Basic " + hash; }; |