From ea87771936dbdaa19e9cc044ccbad66b5021b536 Mon Sep 17 00:00:00 2001 From: Erik Bryn Date: Sat, 23 Jul 2011 19:07:47 -0700 Subject: [PATCH] Refactor --- wot.html | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/wot.html b/wot.html index c66bcfd..c830f73 100644 --- a/wot.html +++ b/wot.html @@ -106,7 +106,7 @@

{{type}}{{^ifProps}} (none){{ webInspector.panels.elements.onSelectionChanged.addListener(function() { webInspector.inspectedWindow.eval("SproutQueryExtension.properties(SC.View.views[$0.id])", function(result) { result = JSON.parse(result); - var buffer = "", resultProp, klassProp, prop, klass, anyProps; + var buffer = "", resultProp, klassProp, prop, klass, anyProps, isArrayProp; var classProperties = true; @@ -140,23 +140,27 @@

{{type}}{{^ifProps}} (none){{ return buffer; } + function arrayProp(klassProp) { + var propArray, buffer = ""; + + if (klassProp.value === "[]") { return simpleProp(klassProp); } + + propArray = klassProp.value.replace(/^\[|\]$/g, '').split(','); + buffer += "
  • " + klassProp.name + ": "; + buffer += "[
      "; + for (var i = 0; i < propArray.length; i++) { + buffer += "
    1. " + propArray[i] + "
    2. "; + } + buffer += "
    ]
  • "; + return buffer; + } + for (prop in klass.properties) { klassProp = klass.properties[prop]; - if (klassProp.value.charAt(0) == '[' && klassProp.value.substring(0, 7) != '[object') { - var propArray = klassProp.value.replace(/^\[|\]$/g, '').split(','); - if (propArray.length > 0 && propArray.toString() != "") { - buffer += "
  • " + klassProp.name + ": "; - buffer += "[
      "; - for (var i = 0; i < propArray.length; i++) { - buffer += "
    1. " + propArray[i] + "
    2. "; - } - buffer += "
    ]
  • "; - } else { - buffer += simpleProp(klassProp); - } - } else { - buffer += simpleProp(klassProp); - } + isArrayProp = klassProp.value.charAt(0) === '[' && klassProp.value.substring(0, 7) !== '[object'; + + if (isArrayProp) { buffer += arrayProp(klassProp); } + else { buffer += simpleProp(klassProp); } } buffer = buffer + "";