minor fixes

iliakan · iliakan · commit 5401678b0753 · 2015-02-13T18:34:38.000+03:00
diff --git a/client/footer/showLinkType.js b/client/footer/showLinkType.js
@@ -57,7 +57,7 @@ module.exports = function() {
     tooltipSpan = null;
   }
 
-  var handler = hoverIntent(onOver, onOut, 'a');
+  var handler = hoverIntent(onOver, onOut);
   document.addEventListener('mouseover', function(event) {
     if (!event.target.closest('a')) return;
     handler.call(this, event);
diff --git a/client/head/sitetoolbar.js b/client/head/sitetoolbar.js
@@ -8,10 +8,25 @@ function onSearchClick(event) {
   var searchToggle = event.target.closest('.sitetoolbar__search-toggle');
 
   if (searchToggle) {
-    var sitetoolbar = document.querySelector('.sitetoolbar');
-    sitetoolbar.classList.toggle('sitetoolbar_search_open');
-    if (sitetoolbar.classList.contains('sitetoolbar_search_open')) {
-      sitetoolbar.querySelector('.sitetoolbar__search-query input').focus();
+    toggle();
+  }
+}
+
+function toggle() {
+  var sitetoolbar = document.querySelector('.sitetoolbar');
+  sitetoolbar.classList.toggle('sitetoolbar_search_open');
+
+  var input = sitetoolbar.querySelector('.sitetoolbar__search-query input');
+  if (sitetoolbar.classList.contains('sitetoolbar_search_open')) {
+    input.focus();
+
+    if (!input.onkeydown) {
+      input.onkeydown = function(e) {
+        if (e.keyCode == 27) {
+          this.value = "";
+          toggle();
+        }
+      };
     }
   }
 }
diff --git a/client/hoverIntent.js b/client/hoverIntent.js
@@ -9,6 +9,8 @@ var handler = hoverIntent(function() {
  $('.codebox').addEventListener('mouseover', handler);
  $('.codebox').addEventListener('mouseout', handler);
 
+ TODO: refactor me.
+
  * @param handlerIn
  * @param handlerOut
  * @returns {Function}
diff --git a/handlers/markup/templates/blocks/sitetoolbar.jade b/handlers/markup/templates/blocks/sitetoolbar.jade
@@ -67,7 +67,7 @@
       +e('li').usermenu-item
         +e('a').secondary-link.__usermenu-link(href="#profile") Профиль
       +e('li').usermenu-item
-        +e('a').secondary-link.__usermenu-link(href="#settings") Настройки аккаунта
+        +e('a').secondary-link.__usermenu-link(href="#settings") Аккаунт
       +e('li').usermenu-item
         +e('a').secondary-link.__usermenu-link(href="#orders") Заказы
       +e('li').usermenu-item
diff --git a/handlers/profile/templates/partials/aboutme.jade b/handlers/profile/templates/partials/aboutme.jade
@@ -12,6 +12,13 @@ include /bem
   +e('profile-field')(field-name="country" field-title="Страна" field-value="me.country")
     input.text-input__control(focus-on="editing" ng-model="editingValue" type="text" name='input')
 
+  // +e('profile-field')(field-name="country" field-title="Страна" field-value="me.country")
+       select(ng-model="editingValue" name="input")
+         - var countries = {Russia: 'Россия', Belorussia: 'Белоруссия'}
+         for title, key in countries
+           option(value=key)= title
+
+
   +e('profile-field')(field-name="town" field-title="Город" field-value="me.town")
     input.text-input__control(focus-on="editing" ng-model="editingValue" type="text" name='input')
 
diff --git a/handlers/search/controllers/index.js b/handlers/search/controllers/index.js
@@ -7,7 +7,7 @@ var Article = require('tutorial').Article;
 // FIXME: many queries to MongoDB for parents (breadcrumbs) Cache them?
 var searchTypes = {
   articles: {
-    title: 'Учебник',
+    title: 'Статьи учебника',
     hit2url: function(hit) {
       return Article.getUrlBySlug(hit.fields.slug[0]);
     },
diff --git a/handlers/search/templates/index.jade b/handlers/search/templates/index.jade
@@ -38,8 +38,15 @@ block content
 
       if results.length < resultsCountPerType[searchType]
          +e.count-note Показываются первые #{results.length} результатов.
-  else
-    +b.search-results Извините, мы ничего не нашли.
+  else if searchQuery
+    +b.search-results
+      | Извините, мы ничего не нашли
+      = ' '
+      if searchType=="articles"
+        | в статьях учебника
+      if searchType=="tasks"
+        | в задачах
+      | .
 
   +b("form").search-form._fixed._hidden(action="/search/")
     +e.content
diff --git a/modules/config/secret.js b/modules/config/secret.js
@@ -1,4 +1,4 @@
-// use env.SECRET_DIR/secret.js if exists OR ./secret.example
+  // use env.SECRET_DIR/secret.js if exists OR ./secret.example
 
 var path = require('path');
 var fs = require('fs');
diff --git a/scripts/elastic/db-js.json b/scripts/elastic/db-js.json
@@ -11,8 +11,7 @@
           "filter":      [
             "lowercase",
             "russian_morphology",
-            "english_morphology",
-            "ru_en_stopwords"
+            "english_morphology"
           ]
         }
       },
diff --git a/templates/blocks/sitetoolbar.jade b/templates/blocks/sitetoolbar.jade
@@ -76,16 +76,15 @@ block append variables
     +e('form').search-content(method="GET", action="/search")
       +e.search-query-wrap
         +b.text-input.__search-query
-          +e('input').control(type="text")
+          +e('input').control(name="query" type="text")
       +e.search-submit-wrap
-        +b('button').submit-button.__search-submit
-          | Найти
+        +b('button').submit-button.__search-submit Найти
   if user
     +e.usermenu
       +e('ul').usermenu-items
         +e('li').usermenu-item
           +e('a').secondary-link.__usermenu-link(href="/profile") Профиль
         +e('li').usermenu-item
-          +e('a').secondary-link.__usermenu-link(href="/profile/account") Настройки аккаунта
+          +e('a').secondary-link.__usermenu-link(href="/profile/account") Аккаунт
         +e('li').usermenu-item
           +e('a').secondary-link.__usermenu-link(href="#" data-action-user-logout) Выйти

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ module.exports = function() {`
`57`	`57`	`tooltipSpan = null;`
`58`	`58`	`}`
`59`	`59`
`60`		`- var handler = hoverIntent(onOver, onOut, 'a');`
	`60`	`+ var handler = hoverIntent(onOver, onOut);`
`61`	`61`	`document.addEventListener('mouseover', function(event) {`
`62`	`62`	`if (!event.target.closest('a')) return;`
`63`	`63`	`handler.call(this, event);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// use env.SECRET_DIR/secret.js if exists OR ./secret.example`
	`1`	`+ // use env.SECRET_DIR/secret.js if exists OR ./secret.example`
`2`	`2`
`3`	`3`	`var path = require('path');`
`4`	`4`	`var fs = require('fs');`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@`
`11`	`11`	`"filter": [`
`12`	`12`	`"lowercase",`
`13`	`13`	`"russian_morphology",`
`14`		`- "english_morphology",`
`15`		`- "ru_en_stopwords"`
	`14`	`+ "english_morphology"`
`16`	`15`	`]`
`17`	`16`	`}`
`18`	`17`	`},`