From 1398372d24c5229d28f8b899cedd23ac59b32a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateu=20Aguil=C3=B3=20Bosch?= Date: Tue, 22 Jul 2014 07:40:49 +0200 Subject: [PATCH 1/7] Remove BitDeli badge. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e2ed55..b3572c5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/mateu-aguilo-bosch/message-center.png?branch=master)](https://travis-ci.org/mateu-aguilo-bosch/message-center) [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/mateu-aguilo-bosch/message-center/trend.png)](https://bitdeli.com/free "Bitdeli Badge") +[![Build Status](https://travis-ci.org/mateu-aguilo-bosch/message-center.png?branch=master)](https://travis-ci.org/mateu-aguilo-bosch/message-center) # Message center service From a77a3f1f15117466a3104a02ccdb453935e0249e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateu=20Aguil=C3=B3=20Bosch?= Date: Tue, 22 Jul 2014 08:15:41 +0200 Subject: [PATCH 2/7] Bump up dev dependencies. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1b7e895..84a17c2 100644 --- a/package.json +++ b/package.json @@ -14,11 +14,11 @@ "author": "Mateu Aguiló Bosch ", "readmeFilename": "README.md", "devDependencies": { - "connect": "2.10", + "connect": "2.23", "connect-route": "0.1", "uglify-js": "2.4", - "bower": "1.2", - "karma": "canary", + "bower": "1.3", + "karma": "0.12", "karma-mocha": "0.1", "karma-ng-scenario": "0.1", "karma-phantomjs-launcher": "0.1" From a32e4a96690bbb030d3f87e251f4dee59ef8ca8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateu=20Aguil=C3=B3=20Bosch?= Date: Tue, 22 Jul 2014 09:32:42 +0200 Subject: [PATCH 3/7] Allow HTML to be rendered (optionally). --- README.md | 7 +++++++ message-center.js | 20 ++++++++++++++------ test/app/index.html | 22 ++++++++++++++++++++++ test/scenarios.js | 22 ++++++++++++++++++++++ 4 files changed, 65 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b3572c5..0ed65fb 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,13 @@ To create a new message you need to follow 3 simple steps: messageCenterService.add('success', 'Your action has been completed!', { status: messageCenterService.status.permanent }); ``` +#### HTML +If you need to add HTML to a message you can do so by passing in the `html` option. HTML is disabled by default. + +```js +messageCenterService.add('success', 'HTML is allowed.', { html: true }); +``` + ## Directive The directive `mcMessages` will allow you to place the messages wherever you want in your layout. Just drop `` or `
` somewhere in your partials and if there are any messages to be shown they will be shown there. Since it's a regular directive you can perform the common alterations and modifications to it to suit your needs. diff --git a/message-center.js b/message-center.js index e44c593..78aeb9f 100644 --- a/message-center.js +++ b/message-center.js @@ -6,8 +6,8 @@ var MessageCenterModule = angular.module('MessageCenterModule', []); // Define a service to inject. MessageCenterModule. - service('messageCenterService', [ - function () { + service('messageCenterService', ['$sce', + function ($sce) { return { mcMessages: this.mcMessages || [], status: { @@ -28,15 +28,17 @@ MessageCenterModule. if (availableTypes.indexOf(type) == -1) { throw "Invalid message type"; } - this.mcMessages.push({ + var messageObject = { type: type, - message: message, status: options.status || this.status.unseen, processed: false, close: function() { return service.remove(this); } - }); + }; + messageObject.message = options.html ? $sce.trustAsHtml(message) : message; + messageObject.html = !!options.html; + this.mcMessages.push(messageObject); }, remove: function (message) { var index = this.mcMessages.indexOf(message); @@ -75,7 +77,13 @@ MessageCenterModule.
\
\ \ - {{ message.message }}\ + \ + \ + \ + \ + \ + {{ message.message }}\ + \
\
\ '; diff --git a/test/app/index.html b/test/app/index.html index 68ca07b..0f3a8e0 100644 --- a/test/app/index.html +++ b/test/app/index.html @@ -10,6 +10,7 @@ $routeProvider .when('/', { templateUrl: 'home' }) .when('/edit', { templateUrl: 'edit' }) + .when('/html', { templateUrl: 'html' }) .when('/permanent', { templateUrl: 'permanent' }); }) @@ -20,6 +21,9 @@ $scope.goEdit = function() { $location.path('/edit'); }; + $scope.goHTML = function() { + $location.path('/html'); + }; $scope.goPermanent = function() { messageCenterService.add('success', 'Showing permanent message!', {status: messageCenterService.status.permanent}); $location.path('/permanent'); @@ -59,6 +63,15 @@ $scope.saveFailure = function() { messageCenterService.add('danger', 'Something went wrong!'); }; + }) + + .controller('AllowHTMLController', function($scope, $location, messageCenterService) { + $scope.allowedHTML = function() { + messageCenterService.add('success', 'HTML is allowed.', {html: true}); + }; + $scope.plainText = function() { + messageCenterService.add('warning', 'HTML is NOT allowed.'); + }; }); @@ -69,6 +82,7 @@

Home

+ @@ -89,6 +103,14 @@

Edit

+ +
diff --git a/test/scenarios.js b/test/scenarios.js index d277892..bb3564a 100644 --- a/test/scenarios.js +++ b/test/scenarios.js @@ -129,4 +129,26 @@ describe('Message Center', function() { expect(messages.count()).toBe(0); }); }); + + describe('when going to the allowed HTML page', function(){ + beforeEach(function() { element('#goHTML').click(); }); + + it('renders a message with HTML enabled', function() { + element('#allowedHTML').click(); + var messages = element('div#mc-messages-wrapper .alert'); + expect(messages.count()).toBe(1); + expect(messages.prop('className')).toEqual('alert alert-success fade in'); + expect(messages.text()).toMatch('HTML is allowed.'); + }); + + it('renders a message with HTML disabled', function() { + element('#plainText').click(); + var messages = element('div#mc-messages-wrapper .alert'); + expect(messages.count()).toBe(1); + expect(messages.prop('className')).toEqual('alert alert-warning fade in'); + expect(messages.text()).toMatch('HTML is NOT allowed.'); + }); + + }); + }); From c79b6b928203af11524adb015b1ce022bc0af6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateu=20Aguil=C3=B3=20Bosch?= Date: Tue, 22 Jul 2014 09:44:58 +0200 Subject: [PATCH 4/7] Add timeout. --- README.md | 7 +++++++ message-center.js | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0ed65fb..08239bb 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,13 @@ If you need to add HTML to a message you can do so by passing in the `html` opti messageCenterService.add('success', 'HTML is allowed.', { html: true }); ``` +### Timer +You can add a timer to the alert so it auto dismisses. To do so, just add a timeout option in miliseconds. + +```js +messageCenterService.add('success', 'Bye bye in 3s!', { timeout: 3000 }); +``` + ## Directive The directive `mcMessages` will allow you to place the messages wherever you want in your layout. Just drop `` or `
` somewhere in your partials and if there are any messages to be shown they will be shown there. Since it's a regular directive you can perform the common alterations and modifications to it to suit your needs. diff --git a/message-center.js b/message-center.js index 78aeb9f..172fa34 100644 --- a/message-center.js +++ b/message-center.js @@ -6,8 +6,8 @@ var MessageCenterModule = angular.module('MessageCenterModule', []); // Define a service to inject. MessageCenterModule. - service('messageCenterService', ['$sce', - function ($sce) { + service('messageCenterService', ['$sce', '$timeout', + function ($sce, $timeout) { return { mcMessages: this.mcMessages || [], status: { @@ -38,6 +38,11 @@ MessageCenterModule. }; messageObject.message = options.html ? $sce.trustAsHtml(message) : message; messageObject.html = !!options.html; + if (angular.isDefined(options.timeout)) { + messageObject.timer = $timeout(function () { + messageObject.close(); + }, options.timeout); + } this.mcMessages.push(messageObject); }, remove: function (message) { From d329b1909889c15aa3e5a966ec72bc838e35b2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateu=20Aguil=C3=B3=20Bosch?= Date: Tue, 22 Jul 2014 09:50:15 +0200 Subject: [PATCH 5/7] Return message from .add. --- message-center.js | 1 + 1 file changed, 1 insertion(+) diff --git a/message-center.js b/message-center.js index 172fa34..726c516 100644 --- a/message-center.js +++ b/message-center.js @@ -44,6 +44,7 @@ MessageCenterModule. }, options.timeout); } this.mcMessages.push(messageObject); + return messageObject; }, remove: function (message) { var index = this.mcMessages.indexOf(message); From 2dfc338e17e7a0d4ab79096dd39a386334582287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20Michels?= Date: Mon, 4 Aug 2014 14:16:23 +0200 Subject: [PATCH 6/7] Add ngAnimate Class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding the possibility to add ngAnimate css classes. Add attribute ‘animation’ to mc-messages element --- message-center.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/message-center.js b/message-center.js index 726c516..5617871 100644 --- a/message-center.js +++ b/message-center.js @@ -81,7 +81,7 @@ MessageCenterModule. /*jshint multistr: true */ var templateString = '\
\ -
\ +
\ \ \ \ @@ -105,6 +105,8 @@ MessageCenterModule. $rootScope.mcMessages = messageCenterService.mcMessages; }; $rootScope.$on('$locationChangeStart', changeReaction); + + scope.animation = attrs.animation || 'fade in'; } }; }]); From 7f3923a8354c05a7b6331764e1bc7f7434aeba65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateu=20Aguil=C3=B3=20Bosch?= Date: Fri, 17 Oct 2014 15:15:03 +0200 Subject: [PATCH 7/7] Add LICENSE file via addalicense.com --- LICENSE.txt | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 280 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..c7c926b --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS \ No newline at end of file