Fixed double-click selection

zhukov · zhukov · commit b03ea1f1b01b · 2015-07-13T19:55:12.000+03:00
Also show ticks up to 900px w
diff --git a/app/js/controllers.js b/app/js/controllers.js
@@ -1402,12 +1402,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
       }
 
       if (!$scope.historyState.selectActions) {
-        var sel = (
-          window.getSelection && window.getSelection() ||
-          document.getSelection && document.getSelection() ||
-          document.selection && document.selection.createRange().text || ''
-        ).toString().replace(/^\s+|\s+$/g, '');
-        if (sel) {
+        if (getSelectedText()) {
           return false;
         }
 
diff --git a/app/js/directives.js b/app/js/directives.js
@@ -1217,7 +1217,7 @@ angular.module('myApp.directives', ['myApp.filters'])
           updateSizes();
           if (data && data.blur) {
             $scope.$broadcast('ui_message_blur');
-          } else {
+          } else if (!getSelectedText()) {
             $scope.$broadcast('ui_message_send');
           }
 
diff --git a/app/js/lib/utils.js b/app/js/lib/utils.js
@@ -237,6 +237,16 @@ function setRichFocus(field, selectNode) {
   }
 }
 
+function getSelectedText () {
+  var sel = (
+    window.getSelection && window.getSelection() ||
+    document.getSelection && document.getSelection() ||
+    document.selection && document.selection.createRange().text || ''
+  ).toString().replace(/^\s+|\s+$/g, '');
+
+  return sel;
+}
+
 function scrollToNode (scrollable, node, scroller) {
   var elTop = node.offsetTop - 15,
       elHeight = node.offsetHeight + 30,
diff --git a/app/less/desktop.less b/app/less/desktop.less
@@ -903,7 +903,7 @@ a.footer_link.active:active {
   display: none;
 }
 
-@media (min-width: 1024px) {
+@media (min-width: 900px) {
   .im_message_wrap {
     position: relative;
   }

Original file line number	Diff line number	Diff line change
`@@ -1402,12 +1402,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])`
`1402`	`1402`	`}`
`1403`	`1403`
`1404`	`1404`	`if (!$scope.historyState.selectActions) {`
`1405`		`- var sel = (`
`1406`		`- window.getSelection && window.getSelection() \|\|`
`1407`		`- document.getSelection && document.getSelection() \|\|`
`1408`		`- document.selection && document.selection.createRange().text \|\| ''`
`1409`		`- ).toString().replace(/^\s+\|\s+$/g, '');`
`1410`		`- if (sel) {`
	`1405`	`+ if (getSelectedText()) {`
`1411`	`1406`	`return false;`
`1412`	`1407`	`}`
`1413`	`1408`
Original file line number	Diff line number	Diff line change
`@@ -1217,7 +1217,7 @@ angular.module('myApp.directives', ['myApp.filters'])`
`1217`	`1217`	`updateSizes();`
`1218`	`1218`	`if (data && data.blur) {`
`1219`	`1219`	`$scope.$broadcast('ui_message_blur');`
`1220`		`- } else {`
	`1220`	`+ } else if (!getSelectedText()) {`
`1221`	`1221`	`$scope.$broadcast('ui_message_send');`
`1222`	`1222`	`}`
`1223`	`1223`
Original file line number	Diff line number	Diff line change
`@@ -903,7 +903,7 @@ a.footer_link.active:active {`
`903`	`903`	`display: none;`
`904`	`904`	`}`
`905`	`905`
`906`		`-@media (min-width: 1024px) {`
	`906`	`+@media (min-width: 900px) {`
`907`	`907`	`.im_message_wrap {`
`908`	`908`	`position: relative;`
`909`	`909`	`}`