change device javascript
merge ni-shi- commits