merging all conflicts

Author: iliakan

1-js/02-first-steps/08-operators/3-primitive-conversions-questions/solution.md

@@ -10,8 +10,8 @@ true + false = 1
 "4" - 2 = 2
 "4px" - 2 = NaN
 7 / 0 = Infinity
-" -9  " + 5 = " -9  5" // (3)
-" -9  " - 5 = -14 // (4)
+"  -9  " + 5 = "  -9  5" // (3)
+"  -9  " - 5 = -14 // (4)
 null + 1 = 1 // (5)
 undefined + 1 = NaN // (6)
 " \t \n" - 2 = -2 // (7)

1-js/02-first-steps/12-nullish-coalescing-operator/article.md

@@ -63,11 +63,19 @@ alert(height || 100); // 100
 alert(height ?? 100); // 0
 ```
 
+<<<<<<< HEAD
 هنا `height || 100` تعامل الصفر كـ `null`, `undefined` أو أي قيمة زائفة. اذا الصفر يصبح `100`.
 
 ولكن `height ?? 100` ترجع `100` إذا كان فقط `height` يساوي تمامًا `null` أو `undefined`. اذا الصفر يبقى "كما هو".
 
 يعتمد السلوك الافضل على حالة الاستخدام. تكون `??` الطريقة الافضل عندما يكون صفر height قيمة صالحة.
+=======
+Here, `height || 100` treats zero height as unset, same as `null`, `undefined` or any other falsy value. So the result is `100`.
+
+The `height ?? 100` returns `100` only if `height` is exactly `null` or `undefined`. So the `alert` shows the height value `0` "as is".
+
+Which behavior is better depends on a particular use case. When zero height is a valid value, then `??` is preferrable.
+>>>>>>> b52aa942a8e9b75ba8a65124c22593171e273bb6
 
 ## الأولوية
 

1-js/03-code-quality/04-ninja-code/article.md

@@ -43,7 +43,11 @@ i = i ? i < 0 ? Math.max(0, len + i) : i : 0;
 منجز.
 ```
 
+<<<<<<< HEAD
 هناك طريقة أخرى للكتابه بشكل أسرع وهي استخدام أسماء المتغيرات ذات الحرف الواحد في كل مكان. مثل `a`, `b` او `c`.
+=======
+Another way to code shorter is to use single-letter variable names everywhere. Like `a`, `b` or `c`.
+>>>>>>> b52aa942a8e9b75ba8a65124c22593171e273bb6
 
 يختفي متغير قصير في الكود مثل نينجا حقيقي في الغابة. لن يتمكن أحد من العثور عليه باستخدام "بحث" المحرر. وحتى لو فعل شخص ما ، فلن يتمكن من معرفه معني `A` او `B`
 

1-js/05-data-types/10-destructuring-assignment/article.md

@@ -138,7 +138,7 @@ alert(`${guest} ${admin}`); // Pete Jane (successfully swapped!)
 Here we create a temporary array of two variables and immediately destructure it in swapped order.
 
 We can swap more than two variables this way.
-```
+
 
 ### The rest '...'
 

1-js/06-advanced-functions/03-closure/9-sort-by-field/_js.view/solution.js

@@ -0,0 +1,3 @@
+function byField(fieldName){
+  return (a, b) => a[fieldName] > b[fieldName] ? 1 : -1;
+}

1-js/06-advanced-functions/03-closure/9-sort-by-field/_js.view/source.js

@@ -0,0 +1,5 @@
+function byField(fieldName){
+
+  // Your code goes here.
+
+}

1-js/06-advanced-functions/03-closure/9-sort-by-field/_js.view/test.js

@@ -0,0 +1,39 @@
+describe("byField", function(){
+
+  let users = [
+    { name: "John", age: 20, surname: "Johnson" },
+    { name: "Pete", age: 18, surname: "Peterson" },
+    { name: "Ann", age: 19, surname: "Hathaway" },
+  ];
+
+  it("sorts users by name", function(){
+    let nameSortedKey = [
+      { name: "Ann", age: 19, surname: "Hathaway" },
+      { name: "John", age: 20, surname: "Johnson"},
+      { name: "Pete", age: 18, surname: "Peterson" },
+    ];
+    let nameSortedAnswer = users.sort(byField("name"));
+    assert.deepEqual(nameSortedKey, nameSortedAnswer);
+  });
+
+  it("sorts users by age", function(){
+    let ageSortedKey = [
+      { name: "Pete", age: 18, surname: "Peterson" },
+      { name: "Ann", age: 19, surname: "Hathaway" },
+      { name: "John", age: 20, surname: "Johnson"},
+    ];
+    let ageSortedAnswer = users.sort(byField("age"));
+    assert.deepEqual(ageSortedKey, ageSortedKey);
+  });
+
+  it("sorts users by surname", function(){
+    let surnameSortedKey = [
+      { name: "Ann", age: 19, surname: "Hathaway" },
+      { name: "John", age: 20, surname: "Johnson"},
+      { name: "Pete", age: 18, surname: "Peterson" },
+    ];
+    let surnameSortedAnswer = users.sort(byField("surname"));
+    assert.deepEqual(surnameSortedAnswer, surnameSortedKey);
+  });
+
+});

1-js/06-advanced-functions/03-closure/9-sort-by-field/solution.md

@@ -1,22 +1 @@
 
-
-```js run
-let users = [
-  { name: "John", age: 20, surname: "Johnson" }, 
-  { name: "Pete", age: 18, surname: "Peterson" },
-  { name: "Ann", age: 19, surname: "Hathaway" }
-];
-
-*!*
-function byField(field) {
-  return (a, b) => a[field] > b[field] ? 1 : -1;
-}
-*/!*
-
-users.sort(byField('name'));
-users.forEach(user => alert(user.name)); // Ann, John, Pete
-
-users.sort(byField('age'));
-users.forEach(user => alert(user.name)); // Pete, Ann, John
-```
-

1-js/08-prototypes/04-prototype-methods/article.md

@@ -57,11 +57,15 @@ alert(rabbit.jumps); // true
 يمكننا استخدام `Object.create` للقيام بنسخ كائن بشكل أفضل من نسخ الخصائص باستخدام التكرار `for..in`:
 
 ```js
+<<<<<<< HEAD
 // كائن جديد مماثل تمامًا
 let clone = Object.create(
   Object.getPrototypeOf(obj),
   Object.getOwnPropertyDescriptors(obj)
 );
+=======
+let clone = Object.create(Object.getPrototypeOf(obj), Object.getOwnPropertyDescriptors(obj));
+>>>>>>> b52aa942a8e9b75ba8a65124c22593171e273bb6
 ```
 
 هذا الإستدعاء يقوم بإنشاء نسخه طبق الأصل من الكائن `obj` بما فيه من خصائص سواءًا كانت معدودة (enumerable) أم لا وكذلك الجالبات والمغيرات (getters & setters) -- كل شيئ وبالخاصية `[[Prototype]]` الصحيحة.

2-ui/3-event-details/6-pointer-events/article.md

@@ -10,7 +10,7 @@ Let's make a small overview, so that you understand the general picture and the
 
     Then touch devices appeared. For the old code to work, they also generate mouse events. For instance, tapping generates `mousedown`. But mouse events were not good enough, as touch devices are more powerful in many aspects. For example, it's possible to touch multiple points at once, and mouse events don't have any properties for that.
 
-- So touch events were introduced, such as `touchstart`, `touchend`, `touchmove`, that have touch-specific properties (we don't cover them in details here, because pointer events are event better).
+- So touch events were introduced, such as `touchstart`, `touchend`, `touchmove`, that have touch-specific properties (we don't cover them in detail here, because pointer events are even better).
 
     Still, it wasn't enough, as there are many other devices, such as pens, that have their own features. Also, writing a code that listens both touch and mouse events was cumbersome.