チェンジセット 289

更新日時:

2016/06/16 17:30:26 (8 年 前)

更新者:

lenz

ログメッセージ:

エンドポイントリスト取得方式の変更
非推奨の非同期通信を取りやめセレクトボックスのdisabledでユーザーアクションを縛る方式に変更

ファイル:

• SPARQLBuilderWWW/web/newsparqlbuilder.js (変更) (9 diff)

SPARQLBuilderWWW/web/newsparqlbuilder.js

@@ -133 +133 @@
                 if(eplist.length == 0){
                         $('.SBEndPointSelect').on('epcomplete', function(){
-                                $('.SBEndPointSelect').val(defendpoint);
+                                $('.SBEndPointSelect option').each(function(){
+                                        if($(this).text() == defendpoint){
+                                                $(this).attr('selected', 'selected');
+                                        }
+                                });
                                 defendpoint = "";
                                 loadStartClassList();
@@ -139 +143 @@
                         });
                 }else{
-                        $('.SBEndPointSelect').val(defendpoint);
+                        $('.SBEndPointSelect option').each(function(){
+                                if($(this).text() == defendpoint){
+                                        $(this).attr('selected', 'selected');
+                                }
+                        });
                         defendpoint = "";
                         loadStartClassList();
@@ -199 +207 @@
         $('.SBPermaLinkButton').attr('disabled', true);
         var url = 'http://www.sparqlbuilder.org/api/eplist?ds=true';
+        $(".SBEndPointSelect").empty();
+        $(".SBEndPointSelect").attr("disabled", "disabled");
+        $(".SBStartClassSelect").empty();
+        $(".SBStartClassSelect").attr("disabled", "disabled");
+        $(".SBEndClassSelect").empty();
+        $(".SBEndClassSelect").attr("disabled", "disabled");
         $.ajax({
                 url: url,
@@ -207 +221 @@
                         for (var i = 0; i < list.length; ++i) {
                                 $(".SBEndPointSelect").append('<option value="' + list[i]['uri'] + '">' + list[i]['label'] + '</option>');
-                                switchLoadIcon("hide");
+                                if(defendpoint == ''){
+                                        switchLoadIcon("hide");
+                                }
                                 if($('.SBModalView').attr('display') == 'block'){
                                         $(".SBEndPointSelect").select2();
@@ -214 +230 @@
                                 }
                         }
+                        $(".SBEndPointSelect").removeAttr("disabled");
                         $(".SBEndPointSelect").trigger(new $.Event('epcomplete'));
                 },
@@ -220 +237 @@
 
 changeEndPoint = function() {
-        endpoint = $(".SBEndPointSelect").val();
+        endpoint = $(".SBEndPointSelect option:selected").text();
         if(endpoint != "SBDefault"){
                 loadStartClassList();
@@ -229 +246 @@
         $('.SBPermaLinkButton').attr('disabled', true);
         var url = "http://www.sparqlbuilder.org/api/clist?ep=" + encodeURIComponent(endpoint);
+        $(".SBStartClassSelect").empty();
+        $(".SBStartClassSelect").attr("disabled", "disabled");
+        $(".SBEndClassSelect").empty();
+        $(".SBEndClassSelect").attr("disabled", "disabled");
         $.ajax({
                 type : "GET",
                 url : url,
-                async : false,
+                //async : false,
                 success : function(data) {
                         var list = eval(data);
                         $(".SBStartClassSelect").empty();
-                        $(".SBEndClassSelect").empty();
                         $(".SBStartClassSelect").append('<option value="SBDefault">SELECT StartClass (From ' + list.length + ' classes below)</option>');
                         for (var i = 0; i < list.length; ++i) {
                                 $(".SBStartClassSelect").append('<option value="' + list[i]['uri'] + '">' + list[i]['label'] + ' (' + list[i]['number'] + ')' + '</option>');
                         }
+                        $(".SBStartClassSelect").removeAttr("disabled");
                         $(".SBStartClassSelect").select2();
                         $(".SBEndClassSelect").select2();
@@ -254 +275 @@
                 type : "GET",
                 url : url,
-                async : false,
+                //async : false,
                 success : function(data) {
                         var list = eval(data);
@@ -262 +283 @@
                                 $(".SBEndClassSelect").append('<option value="' + list[i]['uri'] + '">' + list[i]['label'] + ' (' + list[i]['number'] + ')' + '</option>');
                         }
+                        $(".SBEndClassSelect").removeAttr("disabled");
                         $(".SBStartClassSelect").select2();
                         $(".SBEndClassSelect").select2();