Commit d4f5a6ab by Masaru Abe

フルテスト対応

parent c830214b
...@@ -5572,6 +5572,7 @@ CONTENTVIEW.initScreen = function(){ ...@@ -5572,6 +5572,7 @@ CONTENTVIEW.initScreen = function(){
$('#dialog').removeAttr('style'); $('#dialog').removeAttr('style');
$('#dialog').addClass('web_dialog'); $('#dialog').addClass('web_dialog');
} }
$('#divCheckExistMarking').hide();
$('#divCacheLoading').hide(); $('#divCacheLoading').hide();
$("#overlay").hide(); $("#overlay").hide();
......
...@@ -566,6 +566,8 @@ HOME.canvasClickFunction = function(e) { ...@@ -566,6 +566,8 @@ HOME.canvasClickFunction = function(e) {
var contentId = $(this).attr('id'); var contentId = $(this).attr('id');
var outputId = contentId.substring(17); var outputId = contentId.substring(17);
if (HOME.isShowBookShelf) {
LIMIT_ACCESS_CONTENT.checkLimitContent(outputId, LIMIT_ACCESS_CONTENT.checkLimitContent(outputId,
function(){ function(){
HOME.canvasClickFunction_callback(outputId); HOME.canvasClickFunction_callback(outputId);
...@@ -573,7 +575,9 @@ HOME.canvasClickFunction = function(e) { ...@@ -573,7 +575,9 @@ HOME.canvasClickFunction = function(e) {
function(){ function(){
} }
); );
} else {
HOME.canvasClickFunction_callback(outputId);
}
}; };
HOME.canvasClickFunction_callback = function(outputId){ HOME.canvasClickFunction_callback = function(outputId){
...@@ -1454,7 +1458,7 @@ HOME.readSubmenuFunction_callback = function(contentId) ...@@ -1454,7 +1458,7 @@ HOME.readSubmenuFunction_callback = function(contentId)
else{ else{
//Go to Conten view page //Go to Conten view page
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView); //AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//試験 HOME.drawEditImage(contentId);
HOME.showContentView(); HOME.showContentView();
} }
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Add ContentType to Storage. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Add ContentType to Storage.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment