Adam Shaw 6 лет назад
Родитель
Сommit
e3797d553c

+ 1 - 1
packages-premium

@@ -1 +1 @@
-Subproject commit 5a2162ee9404918d8413c3bb88aae9883e4ab7a8
+Subproject commit e9e425dc2e54fb5a11c3530619da00c76eb5a178

+ 1 - 1
packages/__tests__/src/event-render/eventOrder.js

@@ -89,7 +89,7 @@ describe('eventOrder', function() {
 
   function getEventOrder() {
     return getEventEls().map(function(i, node) {
-      return $(node).data('event-id')
+      return node.getAttribute('data-event-id')
     }).get()
   }
 })

+ 1 - 1
packages/__tests__/src/legacy/ListView.js

@@ -502,7 +502,7 @@ describe('ListView rendering', function() {
       return {
         mainText: getListHeadingElMainElText($el) || '',
         altText: getListHeadingElAltElText($el) || '',
-        date: new Date($el.data('date'))
+        date: new Date(el.getAttribute('data-date'))
       }
     }).get()
   }

+ 1 - 1
packages/__tests__/src/legacy/navLinks.js

@@ -218,7 +218,7 @@ describe('navLinks', function() {
 
   function getDayGridDates() {
     return $('.fc-day-grid .fc-day').map(function(i, el) {
-      return new Date($(el).data('date'))
+      return new Date(el.getAttribute('data-date'))
     }).get()
   }
 

+ 4 - 4
packages/__tests__/src/legacy/now.js

@@ -15,7 +15,7 @@ describe('now', function() {
         now: '2014-05-06'
       })
       var todayCell = $('td.fc-today', currentCalendar.el)
-      var todayDate = todayCell.data('date')
+      var todayDate = todayCell[0].getAttribute('data-date')
       expect(todayDate).toEqual('2014-05-06')
     })
   })
@@ -29,7 +29,7 @@ describe('now', function() {
         now: '2014-04-29T12:00:00'
       })
       var todayCell = $('td.fc-today', currentCalendar.el)
-      expect(todayCell.data('date')).toBe('2014-04-29')
+      expect(todayCell[0].getAttribute('data-date')).toBe('2014-04-29')
     })
   })
 
@@ -41,7 +41,7 @@ describe('now', function() {
       }
     })
     var todayCell = $('td.fc-today', currentCalendar.el)
-    var todayDate = todayCell.data('date')
+    var todayDate = todayCell[0].getAttribute('data-date')
     expect(todayDate).toEqual('2014-05-01')
   })
 
@@ -53,7 +53,7 @@ describe('now', function() {
       }
     })
     var todayCell = $('td.fc-today', currentCalendar.el)
-    var todayDate = todayCell.data('date')
+    var todayDate = todayCell[0].getAttribute('data-date')
     expect(todayDate).toEqual('2014-05-01')
   })
 

+ 1 - 1
packages/__tests__/src/legacy/weekViewRender.js

@@ -15,7 +15,7 @@ describe('weekViewRender', function() {
 
       $('th.fc-day-header', currentCalendar.el).each(function(i, headerNode) {
         var headerEl = $(headerNode)
-        var dateMatchesToday = headerEl.data('date') === nowStr
+        var dateMatchesToday = headerNode.getAttribute('data-date') === nowStr
         var hasTodayClass = headerEl.hasClass('fc-today')
 
         expect(dateMatchesToday).toBe(hasTodayClass)

+ 4 - 5
packages/__tests__/src/lib/time-grid.js

@@ -96,7 +96,6 @@ export function getTimeGridLine(date) { // not in Scheduler
 export function getTimeGridTop(targetTimeMs) {
   const topBorderWidth = 1 // TODO: kill
   let slotEls = getSlotElByTime(targetTimeMs)
-  let slotEl
 
   // exact slot match
   if (slotEls.length === 1) {
@@ -108,17 +107,17 @@ export function getTimeGridTop(targetTimeMs) {
   let prevSlotTimeMs = null
 
   for (let i = 0; i < slotEls.length; i++) { // traverse earlier to later
-    slotEl = slotEls[i]
-    slotEl = $(slotEl)
+    let slotEl = slotEls[i]
+    let $slotEl = $(slotEl)
 
     prevSlotTimeMs = slotTimeMs
-    slotTimeMs = createDuration(slotEl.data('time')).milliseconds
+    slotTimeMs = createDuration(slotEl.getAttribute('data-time')).milliseconds
 
     // is target time between start of previous slot but before this one?
     if (targetTimeMs < slotTimeMs) {
       // before first slot
       if (!prevSlotTimeMs) {
-        return slotEl.offset().top + topBorderWidth
+        return $slotEl.offset().top + topBorderWidth
       } else {
         const prevSlotEl = slotEls.eq(i - 1)
         return prevSlotEl.offset().top + // previous slot top

+ 2 - 2
packages/__tests__/src/view-render/TimeGridRenderUtils.js

@@ -107,7 +107,7 @@ function computeDays() {
     var rect = node.getBoundingClientRect()
     return $.extend({}, rect, {
       date: parseMarker(
-        $(node).data('date')
+        node.getAttribute('data-date')
       ).marker
     })
   }).get()
@@ -124,7 +124,7 @@ function computeSlots() {
     var rect = node.getBoundingClientRect()
     return $.extend({}, rect, {
       startTimeMs: createDuration(
-        $(node).data('time')
+        node.getAttribute('data-time')
       ).milliseconds
     })
   }).get()