From 24fa34f9c29381ad55f72c33457cbeb68e4c37b2 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.andre.petterson@gmail.com>
Date: Tue, 24 Mar 2015 11:01:23 +0100
Subject: [PATCH] Avoid parsing state multiple times.

---
 js/h5p.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/js/h5p.js b/js/h5p.js
index 99c3b1c..d473f66 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -57,6 +57,12 @@ H5P.init = function (target) {
     if (contentData === undefined) {
       return H5P.error('No data for content id ' + contentId + '. Perhaps the library is gone?');
     }
+    if (contentData.contentUserDatas && contentData.contentUserDatas.state) {
+      try {
+        contentData.contentUserDatas.state = JSON.parse(contentData.contentUserDatas.state);
+      }
+      catch (err) {}
+    }
     var library = {
       library: contentData.library,
       params: JSON.parse(contentData.jsonContent),
@@ -612,12 +618,9 @@ H5P.newRunnable = function (library, contentId, $attachTo, skipResize) {
 
   var contentExtrasWrapper;
   if (library.userDatas && library.userDatas.state) {
-    try {
-      contentExtrasWrapper = {
-        previousState: JSON.parse(library.userDatas.state)
-      };
-    }
-    catch (err) {}
+    contentExtrasWrapper = {
+      previousState: library.userDatas.state
+    };
   }
 
   var instance = new constructor(library.params, contentId, contentExtrasWrapper);