Merge pull request #219 from codeschool/resize_textareas

johndjameson · johndjameson · commit 5dffbe280bba · 2015-06-04T09:40:57.000-04:00
Resize textareas
diff --git a/bower.json b/bower.json
@@ -15,17 +15,18 @@
     "tests"
   ],
   "dependencies": {
+    "abecedary": "~0.0.5",
     "angular": "1.4.0-beta.6",
-    "jquery": "~2.1.3",
-    "cs_console": "https://github.com/renz45/cs_console/archive/master.zip",
+    "angular-animate": "1.4.0-beta.6",
+    "angular-cookies": "1.4.0-beta.6",
+    "angular-resource": "1.4.0-beta.6",
+    "autosize": "~3.0.6",
+    "bootstrap": "~3.3.4",
     "codemirror": "~3.16.0",
-    "abecedary": "~0.0.5",
-    "mocha": "~2.2.1",
+    "cs_console": "https://github.com/renz45/cs_console/archive/master.zip",
+    "jquery": "~2.1.3",
     "lodash": "~3.5.0",
-    "angular-resource": "1.4.0-beta.6",
     "marked": "~0.3.3",
-    "angular-animate": "1.4.0-beta.6",
-    "angular-cookies": "1.4.0-beta.6",
-    "bootstrap": "~3.3.4"
+    "mocha": "~2.2.1"
   }
 }
diff --git a/client/javascripts/application.js b/client/javascripts/application.js
@@ -27,7 +27,10 @@ JS.Inbox    = {};
 
 JS.Globals = {
   homepageChallengeAnswer : /^['"][A-z-\.\s]*['"](;)?/,
-  userNameCookie          : 'try_name'
+  userNameCookie          : 'try_name',
+  Vendor                  : {
+    autosizeQuery         : '.js-autosize'
+  }
 };
 
 // -------------------------------------
@@ -41,6 +44,7 @@ jQuery(function($) {
   new JS.Classes.Dispatcher({
     events: [
       { page  : 'course',    run : function() { JS.Pages.Course(); } },
+      { page  : 'feedback',  run : function() { JS.Pages.Feedback(); } },
       { page  : 'home',      run : function() { JS.Pages.Home(); } },
       { match : 'news',      run : function() { JS.Pages.News(); } },
       { page  : 'news:new',  run : function() { JS.Pages.News.New(); } },
diff --git a/client/javascripts/components/dispatcher/feedback.js b/client/javascripts/components/dispatcher/feedback.js
@@ -0,0 +1,22 @@
+// *************************************
+//
+//   Feedback
+//   -> Dispatch events
+//
+// *************************************
+
+JS.Pages.Feedback = function() {
+
+  // -------------------------------------
+  //   Modules
+  // -------------------------------------
+
+  JS.Modules.SaveProgress.init();
+
+  // -------------------------------------
+  //   Vendor
+  // -------------------------------------
+
+  autosize($(JS.Globals.Vendor.autosizeQuery));
+
+};
diff --git a/client/javascripts/components/dispatcher/news.js b/client/javascripts/components/dispatcher/news.js
@@ -30,4 +30,10 @@ JS.Pages.News = function() {
     elementNode : '.js-alert'
   });
 
+  // -------------------------------------
+  //   Vendor
+  // -------------------------------------
+
+  autosize($(JS.Globals.Vendor.autosizeQuery));
+
 };
diff --git a/gulpfile.js b/gulpfile.js
@@ -52,7 +52,11 @@ var options = {
       'client/javascripts/application.js',
       'client/javascripts/**/*.js'
     ],
-    vendorFiles: ['bower_components/jquery/dist/jquery.js', 'bower_components/bootstrap/js/tooltip.js'],
+    vendorFiles: [
+      'bower_components/jquery/dist/jquery.js',
+      'bower_components/bootstrap/js/tooltip.js',
+      'bower_components/autosize/dist/autosize.js'
+    ],
     vendorCourseFiles: [
       'bower_components/angular/angular.js',
       'bower_components/angular-resource/angular-resource.js',
diff --git a/views/feedback/index.jade b/views/feedback/index.jade
@@ -2,6 +2,7 @@ block current_nav
   - current_page = 'Feedback'
 
 block layout_variables
+  - dispatcher = 'feedback'
   - pageTitle = 'Feedback'
 
 extends /views/layouts/layout
@@ -37,7 +38,7 @@ block content
 
         fieldset.form-field
           label.form-label(for='comment' id='Field1') Give us your feedback to help us improve the site.
-          textarea.form-input.js-formValidator-input.js-saveProgress(name='Field1' id='Field1' rows='10' required='true' data-validate='required' data-saveprogress='feedback_content')
+          textarea.form-input.form-textarea.js-autosize.js-formValidator-input.js-saveProgress(name='Field1' id='Field1' rows='8' required='true' data-validate='required' data-saveprogress='feedback_content')
 
         input.btn.js-formValidator-submit(id='saveForm' name='saveForm' type='submit' value='Submit')
 
diff --git a/views/news/new.jade b/views/news/new.jade
@@ -50,7 +50,7 @@ block content
                 span.form-label Description
 
               - bodyValue = body ? body : ''
-              textarea.form-input.form-textarea.js-counter.js-formValidator-input.js-saveProgress(name='body' rows=8 data-validate='required' required='true' placeholder="Today we released Sundae.js 2.0, which now has extra sprinkles, extra nuts, and now has three scoops of vanilla instead of two. If you can't eat dairy, you can now replace the ice cream with sherbert." data-saveprogress='news_description')
+              textarea.form-input.form-textarea.js-autosize.js-counter.js-formValidator-input.js-saveProgress(name='body' rows=4 data-validate='required' required='true' placeholder="Today we released Sundae.js 2.0, which now has extra sprinkles, extra nuts, and now has three scoops of vanilla instead of two. If you can't eat dairy, you can now replace the ice cream with sherbert." data-saveprogress='news_description')
                 =bodyValue
 
               .split
diff --git a/views/news/show.jade b/views/news/show.jade
@@ -76,7 +76,7 @@ block content
                 img.thumb(src=user.avatar_url width=50)
               .bucket-content
                 fieldset.form-field
-                  textarea.form-input.form-textatrea.js-formValidator-input.js-saveProgress(name='body' data-saveprogress='comment' data-validate='required' required='true')
+                  textarea.form-input.form-textatrea.js-autosize.js-formValidator-input.js-saveProgress(name='body' data-saveprogress='comment' data-validate='required' required='true')
 
                 input(type='hidden' name='_csrf' value=token)
                 input.btn.btn--a.form-btn.js-formValidator-submit(type='submit' value='Submit')
