Browse Source

Merge branch 'february_release' of https://github.com/Musare/Musare into february_release

# Conflicts:
#	app/client/stylesheets/app.css
Wesley McCann 9 years ago
parent
commit
98e2d52452

+ 4 - 1
app/client/scripts/events.js

@@ -224,10 +224,13 @@ Template.alertsDashboard.events({
 
 Template.feedback.events({
     "click #feedback_submit": function(){
-        if($("#feedback_message").val().length !== 0){
+        if($("#feedback_message").val().length !== 0 && $("#feedback_message").hasClass("invalid") === false){
             Meteor.call("sendFeedback", $("#feedback_message").val());
             $("#feedback_message").val("");
             $("#modal1").closeModal()
+        } else{
+            var $toastContent = $('<span><strong>Feedback not sent.</strong> Possible reasons include:<ul><li>- Empty Feedback Message</li><li>- Feedback is more than 500 words</li></ul></span>');
+            Materialize.toast($toastContent, 8000);
         }
     },
     "click .upvote": function(){

+ 3 - 0
app/client/stylesheets/app.css

@@ -181,4 +181,7 @@ textarea{
 
 #room-content {
   padding-top: 15px;
+
+.feedback-message{
+    word-wrap: break-word;
 }

+ 3 - 3
app/client/templates/feedback.html

@@ -25,7 +25,7 @@
                                     </ul>
                                 </div>
                             {{/if}}
-                            <p>{{message}}</p>
+                            <p class="feedback-message">{{message}}</p>
                         </div>
                         <div class="card-action">
                             <a class="lowercase" href="/u/{{username}}">{{username}}</a>
@@ -40,7 +40,7 @@
     <div id="modal1" class="modal">
         <div class="modal-content teal darken-4">
             <div class="input-field">
-                <textarea id="feedback_message" class="materialize-textarea" length="500"></textarea>
+                <textarea id="feedback_message" class="materialize-textarea validate" length="500"></textarea>
                 <label for="feedback_message">Give us your feedback and suggestions!</label>
             </div>
             <a id="feedback_submit" class="waves-effect waves-light btn">Submit</a>
@@ -50,7 +50,7 @@
         <div class="modal-content teal darken-4">
             <label>Edit Feedback Message</label>
             <div class="input-field">
-                <textarea id="edit_feedback_message" class="materialize-textarea" length="500"></textarea>
+                <textarea id="edit_feedback_message" class="materialize-textarea validate" length="500"></textarea>
             </div>
             <a id="edit_feedback_submit" class="waves-effect waves-light btn">Submit</a>
         </div>