resolved conflicts

1 files changed, 8 insertions, 9 deletions

diff --git a/share/frontend/imgradient/index.html b/share/frontend/imgradient/index.html
index dd4c8f4..d42b663 100755
--- a/share/frontend/imgradient/index.html
+++ b/share/frontend/imgradient/index.html
@@ -376,10 +376,10 @@ button
 </div> 
 
 <script type="text/javascript" src="/js/jquery.js"></script>
-<script type="text/javascript" src="/js/jquery-ui-1.8.16.custom.min.js"></script>
+<script type="text/javascript" src="jquery-ui-1.8.16.custom.min.js"></script>
 <script type="text/javascript" src="/im/colors/js/jquery.remember-state.js"></script>
 <script type="text/javascript" src="/im/colors/js/jquery.fancybox.js?v=2.1.5"></script>
-<script type="text/javascript" src="/js/colors_iframe.js"></script>
+<script type="text/javascript" src="colors_iframe.js"></script>
 <script type="text/javascript">
 
 	$(function() {
@@ -482,13 +482,12 @@ var Main =
 		},
 	callback: function (data)
     {
-    data = JSON.parse(data) 
-    if (data.error){
-      return Main.error(data.error)
-    }
-    $("#output-cmd").html("size: "+Main.filesize(data.size)+"<br/>"+data.height + "&nbsp;x&nbsp;" + data.width)
-    $("#output-url").val(data.url)
-    $("#output-img").hide().attr("src", data.url).fadeIn(700)
+      if (data.error){
+        return Main.error(data.error)
+      }
+      $("#output-cmd").html("size: "+Main.filesize(data.size)+"<br/>"+data.height + "&nbsp;x&nbsp;" + data.width)
+      $("#output-url").val(data.url)
+      $("#output-img").hide().attr("src", data.url).fadeIn(700)
     },
 	filesize: function (size)
 		{