浏览代码

Fixes focus in Feedback and makes animation configurable.

j8
yanas 8 年前
父节点
当前提交
2d2915967c
共有 4 个文件被更改,包括 19 次插入10 次删除
  1. 2
    2
      css/_variables.scss
  2. 1
    1
      css/modals/feedback/_feedback.scss
  3. 3
    1
      interface_config.js
  4. 13
    6
      modules/UI/feedback/FeedbackWindow.js

+ 2
- 2
css/_variables.scss 查看文件

48
 $raiseHandBg: #D6D61E;
48
 $raiseHandBg: #D6D61E;
49
 
49
 
50
 $rateStarDefault: #ccc;
50
 $rateStarDefault: #ccc;
51
-$rateStarActivity: #f6c342;
51
+$rateStarActivity: #165ecc;
52
 $rateStarLabelColor: #333;
52
 $rateStarLabelColor: #333;
53
 
53
 
54
 /**
54
 /**
64
 $overlayZ: 800;
64
 $overlayZ: 800;
65
 
65
 
66
 /**
66
 /**
67
- * Font Colors TODO: change according the design
67
+ * Font Colors TODO: Change colors when general dialogs are implemented.
68
  */
68
  */
69
 $defaultFontColor: #777;
69
 $defaultFontColor: #777;
70
 $defaultLightFontColor: #F1F1F1;
70
 $defaultLightFontColor: #F1F1F1;

+ 1
- 1
css/modals/feedback/_feedback.scss 查看文件

102
     &__details {
102
     &__details {
103
         text-align: left;
103
         text-align: left;
104
         textarea {
104
         textarea {
105
-            resize: vertical;
106
             min-height: 100px;
105
             min-height: 100px;
106
+            width: 100%;
107
         }
107
         }
108
     }
108
     }
109
 }
109
 }

+ 3
- 1
interface_config.js 查看文件

38
     LOCAL_THUMBNAIL_RATIO_WIDTH: 16,
38
     LOCAL_THUMBNAIL_RATIO_WIDTH: 16,
39
     LOCAL_THUMBNAIL_RATIO_HEIGHT: 9,
39
     LOCAL_THUMBNAIL_RATIO_HEIGHT: 9,
40
     REMOTE_THUMBNAIL_RATIO_WIDTH: 1,
40
     REMOTE_THUMBNAIL_RATIO_WIDTH: 1,
41
-    REMOTE_THUMBNAIL_RATIO_HEIGHT: 1
41
+    REMOTE_THUMBNAIL_RATIO_HEIGHT: 1,
42
+    // Enables feedback star animation.
43
+    ENABLE_FEEDBACK_ANIMATION: false
42
 };
44
 };

+ 13
- 6
modules/UI/feedback/FeedbackWindow.js 查看文件

48
  * @returns {string} the contructed html string
48
  * @returns {string} the contructed html string
49
  */
49
  */
50
 let createRateFeedbackHTML = function (Feedback) {
50
 let createRateFeedbackHTML = function (Feedback) {
51
-    var rateExperience = APP.translation.translateString('dialog.rateExperience'),
51
+    let rateExperience
52
+            = APP.translation.translateString('dialog.rateExperience'),
52
         feedbackHelp = APP.translation.translateString('dialog.feedbackHelp'),
53
         feedbackHelp = APP.translation.translateString('dialog.feedbackHelp'),
53
         feedbackQuestion = (Feedback.feedbackScore < 0)
54
         feedbackQuestion = (Feedback.feedbackScore < 0)
54
         ? `<p><br/>${APP.translation.translateString('dialog.feedbackQuestion')}</p>`
55
         ? `<p><br/>${APP.translation.translateString('dialog.feedbackQuestion')}</p>`
55
         : '';
56
         : '';
56
 
57
 
58
+    let starClassName = (interfaceConfig.ENABLE_FEEDBACK_ANIMATION)
59
+                            ? "icon-star shake-rotate"
60
+                            : "icon-star";
61
+
57
     return `
62
     return `
58
         <div class="aui-dialog2-content feedback__content">
63
         <div class="aui-dialog2-content feedback__content">
59
             ${feedbackQuestion}
64
             ${feedbackQuestion}
63
                     <p class="star-label">&nbsp;</p>
68
                     <p class="star-label">&nbsp;</p>
64
                     <div id="stars" class="feedback-stars">
69
                     <div id="stars" class="feedback-stars">
65
                         <a class="star-btn">
70
                         <a class="star-btn">
66
-                            <i class="icon-star shake-rotate"></i>
71
+                            <i class=${ starClassName }></i>
67
                         </a>
72
                         </a>
68
                         <a class="star-btn">
73
                         <a class="star-btn">
69
-                            <i class="icon-star shake-rotate"></i>
74
+                            <i class=${ starClassName }></i>
70
                         </a>
75
                         </a>
71
                         <a class="star-btn">
76
                         <a class="star-btn">
72
-                            <i class="icon-star shake-rotate"></i>
77
+                            <i class=${ starClassName }></i>
73
                         </a>
78
                         </a>
74
                         <a class="star-btn">
79
                         <a class="star-btn">
75
-                            <i class="icon-star shake-rotate"></i>
80
+                            <i class=${ starClassName }></i>
76
                         </a>
81
                         </a>
77
                         <a class="star-btn">
82
                         <a class="star-btn">
78
-                            <i class="icon-star shake-rotate"></i>
83
+                            <i class=${ starClassName }></i>
79
                         </a>
84
                         </a>
80
                     </div>
85
                     </div>
81
                     <p>&nbsp;</p>
86
                     <p>&nbsp;</p>
140
             Feedback.hide();
145
             Feedback.hide();
141
         });
146
         });
142
     }
147
     }
148
+
149
+    $('#feedbackTextArea').focus();
143
 };
150
 };
144
 
151
 
145
 /**
152
 /**

正在加载...
取消
保存