Reduce number of calls in method

xmpp-ftw · Jul 20, 2014 · 636e5c4 · 636e5c4
1 parent 455804c
commit 636e5c4
Showing 1 changed file with 27 additions and 24 deletions.
diff --git a/public/scripts/demo.js b/public/scripts/demo.js
@@ -22,6 +22,32 @@ var getEntryHtml = function(callback) {
         '</div>')
 }
 
+var addCallbackDiv = function(html) {
+    var callbackDiv = html.find('.callback')
+    callbackDiv.attr('contenteditable', 'true')
+        .text('{...Write JSON callback data here...}')
+    callbackDiv.addClass('out')
+    var callbackButtonDiv = $('<div class="in-callback-submit"></div>')
+    var callbackButton = $('<button>Send callback</button>')
+    callbackButtonDiv.append(callbackButton)
+    html.append(callbackButtonDiv)
+    setTimeout(function() {
+        $(callbackButtonDiv).css('height', $(callbackDiv).css('height'))
+    }, 100)
+    callbackButton.click(function() {
+        var parsed = null
+        try {
+            parsed = JSON.parse(callbackDiv.text())
+        } catch (e) {
+            console.error(e)
+            return window.alert('You must enter valid JSON:\n\n' + e.toString())
+        }
+        callback(parsed)
+        callbackButtonDiv.remove()
+    })
+    callbackDiv.append()
+}
+
 var addMessage = function(message, direction, data, callback) {
     console.log('IN: ', message, direction, data, callback)
     var html = getEntryHtml(callback)
@@ -38,30 +64,7 @@ var addMessage = function(message, direction, data, callback) {
     var isCallback = (incoming[message] && (-1 !== incoming[message].indexOf('callback')))
 
     if (('in' === direction) && isCallback) {
-
-        var callbackDiv = html.find('.callback')
-        callbackDiv.attr('contenteditable', 'true')
-            .text('{...Write JSON callback data here...}')
-        callbackDiv.addClass('out')
-        var callbackButtonDiv = $('<div class="in-callback-submit"></div>')
-        var callbackButton = $('<button>Send callback</button>')
-        callbackButtonDiv.append(callbackButton)
-        html.append(callbackButtonDiv)
-        setTimeout(function() {
-            $(callbackButtonDiv).css('height', $(callbackDiv).css('height'))
-        }, 100)
-        callbackButton.click(function() {
-            var parsed = null
-            try {
-                parsed = JSON.parse(callbackDiv.text())
-            } catch (e) {
-                console.error(e)
-                return window.alert('You must enter valid JSON:\n\n' + e.toString())
-            }
-            callback(parsed)
-            callbackButtonDiv.remove()
-        })
-        callbackDiv.append()
+        addCallbackDiv(html)
     }
     $('#messages').append(html)
     return id