From ee6657f05c7d360a5c34e817e7041227530b4f10 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 19 Jan 2017 16:21:04 +0100
Subject: [PATCH] add caret to dropdownpanel / remove ASMCode.js

---
 src/ui/ASMCode.js              | 55 ----------------------------------
 src/ui/DropdownPanel.js        |  8 +++++
 src/ui/styles/basicStyles.js   |  4 ++-
 src/ui/styles/dropdownPanel.js |  4 ++-
 4 files changed, 14 insertions(+), 57 deletions(-)
 delete mode 100644 src/ui/ASMCode.js

diff --git a/src/ui/ASMCode.js b/src/ui/ASMCode.js
deleted file mode 100644
index e74c02a854..0000000000
--- a/src/ui/ASMCode.js
+++ /dev/null
@@ -1,55 +0,0 @@
-'use strict'
-var style = require('./styles/basicStyles')
-var yo = require('yo-yo')
-var ui = require('../helpers/ui')
-
-function ASMCode (_parent, _codeManager) {
-  this.parent = _parent
-  this.codeManager = _codeManager
-  this.code
-  this.address
-  this.codeView
-
-  this.init()
-}
-
-ASMCode.prototype.render = function () {
-  var view = (
-    yo`<select size='10' id='asmitems' ref='itemsList' style=${ui.formatCss(style.instructionsList)}>
-      ${this.codeView}
-    </select>`
-  )
-  if (!this.view) {
-    this.view = view
-  }
-  return view
-}
-
-ASMCode.prototype.init = function () {
-  this.codeManager.event.register('changed', this, this.changed)
-}
-
-ASMCode.prototype.indexChanged = function (index) {
-  document.getElementById('asmitems').value = index
-}
-
-ASMCode.prototype.changed = function (code, address, index) {
-  if (this.address !== address) {
-    this.code = code
-    this.address = address
-    this.renderAssemblyItems()
-    yo.update(this.view, this.render())
-  }
-  this.indexChanged(index)
-}
-
-ASMCode.prototype.renderAssemblyItems = function () {
-  if (this.code) {
-    this.codeView = this.code.map(function (item, i) {
-      return yo`<option key=${i} value=${i}>${item}</option>`
-    })
-    return this.codeView
-  }
-}
-
-module.exports = ASMCode
diff --git a/src/ui/DropdownPanel.js b/src/ui/DropdownPanel.js
index 8f36e1071d..55dc1f661c 100644
--- a/src/ui/DropdownPanel.js
+++ b/src/ui/DropdownPanel.js
@@ -41,6 +41,7 @@ DropdownPanel.prototype.render = function (overridestyle) {
   var self = this
   var view = yo`<div>
     <div class='title' style=${ui.formatCss(styleDropdown.title)} onclick=${function () { self.toggle() }}>
+      <div style=${ui.formatCss(styleDropdown.caret)} class='fa fa-caret-right'></div>
       <div style=${ui.formatCss(styleDropdown.inner, styleDropdown.titleInner)}>${this.name}</div>
     </div>
     <div class='dropdownpanel' style=${ui.formatCss(styleDropdown.content)} style='display:none'>
@@ -65,24 +66,31 @@ DropdownPanel.prototype.toggleRaw = function () {
 
 DropdownPanel.prototype.toggle = function () {
   var el = this.view.querySelector('.dropdownpanel')
+  var caret = this.view.querySelector('.title').firstElementChild
   if (el.style.display === '') {
     el.style.display = 'none'
+    caret.className = 'fa fa-caret-right'
   } else {
     el.style.display = ''
+    caret.className = 'fa fa-caret-down'
   }
 }
 
 DropdownPanel.prototype.hide = function () {
   if (this.view) {
+    var caret = this.view.querySelector('.title').firstElementChild
     var el = this.view.querySelector('.dropdownpanel')
     el.style.display = 'none'
+    caret.className = 'fa fa-caret-right'
   }
 }
 
 DropdownPanel.prototype.show = function () {
   if (this.view) {
+    var caret = this.view.querySelector('.title').firstElementChild
     var el = this.view.querySelector('.dropdownpanel')
     el.style.display = ''
+    caret.className = 'fa fa-caret-down'
   }
 }
 
diff --git a/src/ui/styles/basicStyles.js b/src/ui/styles/basicStyles.js
index 6d3389bb5b..7d11faeaf5 100644
--- a/src/ui/styles/basicStyles.js
+++ b/src/ui/styles/basicStyles.js
@@ -27,7 +27,9 @@ module.exports = {
     'width': '52%',
     'overflow-y': 'scroll',
     'max-height': '250px',
-    'margin': '0'
+    'margin': '0',
+    'margin-left': '10px',
+    'padding': '2px'
   },
   transactionInfo: {
     'margin-top': '5px'
diff --git a/src/ui/styles/dropdownPanel.js b/src/ui/styles/dropdownPanel.js
index 3fada2c156..8da59c3b5a 100644
--- a/src/ui/styles/dropdownPanel.js
+++ b/src/ui/styles/dropdownPanel.js
@@ -18,11 +18,13 @@ module.exports = {
   },
   inner: {
     'padding': '2px',
-    'margin-left': '10px',
     'word-break': 'break-all'
   },
   copyBtn: {
     'float': 'right',
     'margin-top': '3px'
+  },
+  caret: {
+    'margin-left': '5px'
   }
 }