Merge branch 'master' of github.com:javascript-tutorial/en.javascript.info into sync-5b195795

Author: iliakan

1-js/02-first-steps/06-type-conversions/article.md

@@ -1,6 +1,6 @@
 # Type Conversions
 
-Most of the time, operators and functions automatically convert the values given to them to the right type. 
+Most of the time, operators and functions automatically convert the values given to them to the right type.
 
 For example, `alert` automatically converts any value to a string to show it. Mathematical operations convert values to numbers.
 
@@ -81,18 +81,7 @@ alert( Number(false) );       // 0
 
 Please note that `null` and `undefined` behave differently here: `null` becomes zero while `undefined` becomes `NaN`.
 
-````smart header="Addition '+' concatenates strings"
-Almost all mathematical operations convert values to numbers. A notable exception is addition `+`. If one of the added values is a string, the other one is also converted to a string.
-
-Then, it concatenates (joins) them:
-
-```js run
-alert( 1 + '2' ); // '12' (string to the right)
-alert( '1' + 2 ); // '12' (string to the left)
-```
-
-This only happens when at least one of the arguments is a string. Otherwise, values are converted to numbers.
-````
+Most mathematical operators also perform such conversion, we'll see that in the next chapter.
 
 ## Boolean Conversion
 

…mitive-conversions-questions/solution.md …mitive-conversions-questions/solution.md1-js/02-first-steps/06-type-conversions/1-primitive-conversions-questions/solution.md renamed to 1-js/02-first-steps/07-operators/3-primitive-conversions-questions/solution.md 1-js/02-first-steps/06-type-conversions/1-primitive-conversions-questions/solution.md renamed to 1-js/02-first-steps/07-operators/3-primitive-conversions-questions/solution.md

@@ -13,7 +13,7 @@ null === +"\n0\n" → false
 Some of the reasons:
 
 1. Obviously, true.
-2. Dictionary comparison, hence false.
+2. Dictionary comparison, hence false. `"a"` is smaller than `"p"`.
 3. Again, dictionary comparison, first char of `"2"` is greater than the first char of `"1"`.
 4. Values `null` and `undefined` equal each other only.
 5. Strict equality is strict. Different types from both sides lead to false.

…-primitive-conversions-questions/task.md …-primitive-conversions-questions/task.md1-js/02-first-steps/06-type-conversions/1-primitive-conversions-questions/task.md renamed to 1-js/02-first-steps/07-operators/3-primitive-conversions-questions/task.md 1-js/02-first-steps/06-type-conversions/1-primitive-conversions-questions/task.md renamed to 1-js/02-first-steps/07-operators/3-primitive-conversions-questions/task.md

@@ -66,7 +66,7 @@ Object.defineProperty(obj, propertyName, descriptor)
 : The object and its property to apply the descriptor.
 
 `descriptor`
-: Property descriptor to apply.
+: Property descriptor object to apply.
 
 If the property exists, `defineProperty` updates its flags. Otherwise, it creates the property with the given value and flags; in that case, if a flag is not supplied, it is assumed `false`.
 

1-js/02-first-steps/08-comparison/1-comparison-questions/solution.md

@@ -2,18 +2,18 @@ The solution is short, yet may look a bit tricky, so here I provide it with exte
 
 
 ```js
-let sortedRows = Array.from(table.rows)
-  .slice(1)
-  .sort((rowA, rowB) => rowA.cells[0].innerHTML > rowB.cells[0].innerHTML ? 1 : -1);
+let sortedRows = Array.from(table.tBodies[0].rows) // (1)
+  .sort((rowA, rowB) => rowA.cells[0].innerHTML > rowB.cells[0].innerHTML ? 1 : -1); // (2)
 
-table.tBodies[0].append(...sortedRows);
+table.tBodies[0].append(...sortedRows); // (3)
 ```
 
-1. Get all `<tr>`, like `table.querySelectorAll('tr')`, then make an array from them, cause we need array methods.
-2. The first TR (`table.rows[0]`) is actually a table header, so we take the rest by `.slice(1)`.
-3. Then sort them comparing by the content of the first `<td>` (the name field).
-4. Now insert nodes in the right order by `.append(...sortedRows)`.
+The step-by-step algorthm:
 
-    Tables always have an implicit `<tbody>` element, so we need to take it and insert into it: a simple `table.append(...)` would fail.
+1. Get all `<tr>`, from `<tbody>`.
+2. Then sort them comparing by the content of the first `<td>` (the name field).
+3. Now insert nodes in the right order by `.append(...sortedRows)`.
 
-    Please note: we don't have to remove them, just "re-insert", they leave the old place automatically.
+Please note: we don't have to remove row elements, just "re-insert", they leave the old place automatically.
+
+Also note: even if the table HTML doesn't have `<tbody>`, the DOM structure always has it. So we must insert elements as `table.tBodes[0].append(...)`: a simple `table.append(...)` would fail.

1-js/07-object-properties/01-property-descriptors/article.md

@@ -28,8 +28,8 @@
       let box = elem.getBoundingClientRect();
 
       return {
-        top: box.top + pageYOffset,
-        left: box.left + pageXOffset
+        top: box.top + window.pageYOffset,
+        left: box.left + window.pageXOffset
       };
     }
 

2-ui/1-document/07-modifying-document/12-sort-table/solution.md

@@ -26,8 +26,8 @@
       let box = elem.getBoundingClientRect();
 
       return {
-        top: box.top + pageYOffset,
-        left: box.left + pageXOffset
+        top: box.top + window.pageYOffset,
+        left: box.left + window.pageXOffset
       };
     }
 

2-ui/1-document/11-coordinates/3-position-at-absolute/solution.view/index.html

@@ -215,8 +215,8 @@ function getCoords(elem) {
   let box = elem.getBoundingClientRect();
 
   return {
-    top: box.top + pageYOffset,
-    left: box.left + pageXOffset
+    top: box.top + window.pageYOffset,
+    left: box.left + window.pageXOffset
   };
 }
 ```

2-ui/1-document/11-coordinates/4-position-inside-absolute/solution.view/index.html

@@ -20,20 +20,17 @@
   <div id="tooltip" hidden>Tooltip</div>
 
   <script>
-    // for the demo
-    setTimeout(function() {
-      new HoverIntent({
-        elem,
-        over() {
-          tooltip.style.left = elem.getBoundingClientRect().left + 5 + 'px';
-          tooltip.style.top = elem.getBoundingClientRect().bottom + 5 + 'px';
-          tooltip.hidden = false;
-        },
-        out() {
-          tooltip.hidden = true;
-        }
-      });
-    }, 2000);
+    new HoverIntent({
+      elem,
+      over() {
+        tooltip.style.left = elem.getBoundingClientRect().left + 5 + 'px';
+        tooltip.style.top = elem.getBoundingClientRect().bottom + 5 + 'px';
+        tooltip.hidden = false;
+      },
+      out() {
+        tooltip.hidden = true;
+      }
+    });
   </script>
 
 </body>