Merge branch 'sync-62299ed8'

Author: mehradsadeghi

1-js/05-data-types/02-number/article.md

@@ -412,7 +412,17 @@ alert( Math.pow(2, 10) ); // دو به توان ده = 1024
 
 - `num.toString(base)` یک عدد را به یک رشته‌ی حرفی در سیستم عددی با پایه داده شده تبدیل می‌کند.
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 برای تبدیل مقادیری مثل `12pt` و `100px` به یک عدد:
+=======
+- Can write numbers directly in hex (`0x`), octal (`0o`) and binary (`0b`) systems.
+- `parseInt(str, base)` parses the string `str` into an integer in numeral system with given `base`, `2 ≤ base ≤ 36`.
+- `num.toString(base)` converts a number to a string in the numeral system with the given `base`.
+>>>>>>> 62299ed853674c4fd1427cd310516d5535bce648
+=======
+برای تبدیل مقادیری مثل `12pt` و `100px` به یک عدد:
+>>>>>>> master
 
 - `parseInt/parseFloat` را برای تبدیلات ساده استفاده کنید که یک عدد را از یک رشته‌ی حرفی می‌خواند و سپس مقداری که قبل از بروز خطا خوانده‌ست را برمی‌گرداند.
 

2-ui/2-events/02-bubbling-and-capturing/article.md

@@ -186,9 +186,9 @@ There's a property `event.eventPhase` that tells us the number of the phase on w
 
 The event handling process:
 
-- Then the event moves down from the document root to `event.target`, calling handlers assigned with `addEventListener(..., true)` on the way (`true` is a shorthand for `{capture: true}`).
-- Then handlers are called on the target element itself.
-- Then the event bubbles up from `event.target` up to the root, calling handlers assigned using `on<event>` and `addEventListener` without the 3rd argument or with the 3rd argument `false/{capture:false}`.
+- When an event happens -- the most nested element where it happens gets labeled as the "target element" (`event.target`).
+- Then the event first moves from the document root down to the `event.target`, calling handlers assigned with `addEventListener(...., true)` on the way.
+- Then the event moves from `event.target` up to the root, calling handlers assigned using  `on<event>` and `addEventListener` without the 3rd argument or with the 3rd argument `false`.
 
 Each handler can access `event` object properties: