浏览代码

update calendar name with a more safe ways

Come 8 年前
父节点
当前提交
289d31f7f5
共有 1 个文件被更改,包括 11 次插入3 次删除
  1. 11 3
      tracim/tracim/public/_caldavzap/forms.js

+ 11 - 3
tracim/tracim/public/_caldavzap/forms.js 查看文件

1667
 	var calendarObj = $('#event_calendar');
1667
 	var calendarObj = $('#event_calendar');
1668
 	var calSelected = $('.resourceCalDAV_item.resourceCalDAV_item_selected').attr('data-id');
1668
 	var calSelected = $('.resourceCalDAV_item.resourceCalDAV_item_selected').attr('data-id');
1669
 
1669
 
1670
+  var calendarsApiHasResponded = false
1670
 	// begin custom code
1671
 	// begin custom code
1671
   $.ajax({
1672
   $.ajax({
1672
     url: '/api/calendars/',
1673
     url: '/api/calendars/',
1703
         calendarObj.append(new Option(calName, cals[i].uid));
1704
         calendarObj.append(new Option(calName, cals[i].uid));
1704
       }
1705
       }
1705
     }
1706
     }
1707
+    calendarsApiHasResponded = true
1706
   })
1708
   })
1707
 
1709
 
1708
 	if(mod=='new')
1710
 	if(mod=='new')
2394
 		}
2396
 		}
2395
 		/*************************** END OF BAD HACKS SECTION ***************************/
2397
 		/*************************** END OF BAD HACKS SECTION ***************************/
2396
 		if(calEvent.etag!='') {
2398
 		if(calEvent.etag!='') {
2397
-      window.setTimeout(function () {
2398
-        $('#event_calendar').val(calEvent.res_id);
2399
-      }, 1)
2399
+      var interval = window.setInterval(function () {
2400
+        if (calendarsApiHasResponded === true) {
2401
+          $('#event_calendar').val(calEvent.res_id);
2402
+          stopInterval()
2403
+        }
2404
+      }, 500)
2405
+      var stopInterval = function () {
2406
+        window.clearInterval(interval)
2407
+      }
2400
     }
2408
     }
2401
 	}
2409
 	}
2402
 
2410