Ticket #3403: and_for_list.patch

source/gui/scripting/GuiScriptConversions.cpp

@@ -123 +123 @@
         ret.setObject(*val->GetJSObject());
 }
 
+template<> void ScriptInterface::ToJSVal<CGUIString>(JSContext* cx, JS::MutableHandleValue ret, const CGUIString& val)
+{
+    ScriptInterface::ToJSVal(cx, ret, val.GetOriginalString());
+}
+
+template<> bool ScriptInterface::FromJSVal<CGUIString>(JSContext* cx, JS::HandleValue v, CGUIString& out)
+{
+    std::wstring val;
+    if (!ScriptInterface::FromJSVal(cx, v, val))
+        return false;
+    out.SetValue(val);
+    return true;
+}
+
 // define some vectors
 VECTOR(CVector2D)
 VECTOR(std::vector<CVector2D>)
+VECTOR(CGUIString)
 

source/gui/scripting/JSInterface_IGUIObject.cpp

@@ -284 +284 @@
         {
             CGUIList value;
             GUI<CGUIList>::GetSetting(e, propName, value);
-
-            JS::RootedObject obj(cx, JS_NewArrayObject(cx, JS::HandleValueArray::empty()));
-            vp.setObject(*obj);
-
-            for (u32 i = 0; i < value.m_Items.size(); ++i)
-            {
-                JS::RootedValue val(cx);
-                ScriptInterface::ToJSVal(cx, &val, value.m_Items[i].GetOriginalString());
-                JS_SetElement(cx, obj, i, val);
-            }
-
+            ScriptInterface::ToJSVal(cx, vp, value.m_Items);
             break;
         }
 
@@ -564 +554 @@
 
     case GUIST_CGUIList:
     {
-        u32 length;
-        if (!vp.isObject() || !JS_GetArrayLength(cx, vpObj, &length))
-        {
-            JS_ReportError(cx, "List only accepts a GUIList object");
-            return false;
-        }
-
         CGUIList list;
-
-        for (u32 i = 0; i < length; ++i)
+        if (ScriptInterface::FromJSVal(cx, vp, list.m_Items))
+            GUI<CGUIList>::SetSetting(e, propName, list);
+        else
         {
-            JS::RootedValue element(cx);
-            if (!JS_GetElement(cx, vpObj, i, &element))
-            {
-                JS_ReportError(cx, "Failed to get list element");
-                return false;
-            }
-
-            std::wstring value;
-            if (!ScriptInterface::FromJSVal(cx, element, value))
-                return false;
-
-            CGUIString str;
-            str.SetValue(value);
-
-            list.m_Items.push_back(str);
+            JS_ReportError(cx, "Failed to get list '%s'", propName.c_str());
+            return false;
         }
-
-        GUI<CGUIList>::SetSetting(e, propName, list);
         break;
     }