ting.yin 5 år sedan
förälder
incheckning
fdfe8bf927

+ 3 - 4
stmms-web/src/main/webapp/WEB-INF/views/include/jsonView.jsp

@@ -9,9 +9,8 @@
 <link rel="stylesheet" type="text/css" href="${ctxStatic}/iviewer/jquery.iviewer.css">
 <script type="text/javascript" src="${ctxStatic}/iviewer/jquery.iviewer.js"></script>
 
-<link rel="stylesheet" type="text/css" href="${ctxStatic}/mark-json/css/rich-text.css">
-<link rel="stylesheet" type="text/css" href="${ctxStatic}/mark-json/css/style.css">
-<script type="text/javascript" src="${ctxStatic}/mark-json/js/rich-text-builder.js"></script>
+<link rel="stylesheet" type="text/css" href="${ctxStatic}/rich-text/css/rich-text.css">
+<script type="text/javascript" src="${ctxStatic}/rich-text/js/render.js"></script>
 
 <div id="json-view-content" class="container-fluid" style="display:none">
 	<div class="row-fluid">
@@ -48,7 +47,7 @@ function initJsonPopoverContent(title,url){
         success:function(data){   
 /*         	var data='[{"mainNumber": 4,"body": {"sections": [{"blocks": [{"type": "text","value": "go"}]}]},"subNumber": 16}]'; */
         	$('#right-json-nav').append('<li><a href="#" data-toggle="tab">'+title+'</a></li>');
-        	var richText = RichTextBuilder(data);
+        	var richText = renderRichText(data);
         	$('#right-json-content').empty();
         	var pane = $(richText).appendTo($('#right-json-content'));
         	$('#right-json-nav a:first').trigger('click');

+ 0 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markJson.jsp

@@ -6,8 +6,6 @@
     <title>云阅卷高校版</title>
     <link href="${ctxStatic}/mark-new/css/bootstrap.css" rel="stylesheet" type="text/css"/>
     <link href="${ctxStatic}/mark-new/css/style.css" rel="stylesheet" type="text/css"/>
-    <link href="${ctxStatic}/mark-json/css/style.css" rel="stylesheet" type="text/css"/>
-    <link href="${ctxStatic}/mark-json/css/rich-text.css" rel="stylesheet" type="text/css"/>
 
     <script type="text/javascript" src="${ctxStatic}/mark-new/js/json2.js"></script>
 

+ 0 - 7
stmms-web/src/main/webapp/static/mark-json/js/mark-control.js

@@ -648,13 +648,6 @@ MarkControl.prototype.addNavGroup = function (title, content) {
     return nav;
 }
 
-//默认要初始化的模块名称
-MarkControl.prototype.defaultModules = {
-    'json-builder': {
-        answerServer: '${answerServer}'
-    }
-};
-
 MarkControl.prototype.main_row_dom = '<div class="row-fluid" style="background-image:url({staticServer}/mark-new/images/background.jpg)"></div>';
 
 MarkControl.prototype.sidebar_dom = '<div class="mark-sidebar span2 hide"></div>';