Adam Shaw пре 7 година
родитељ
комит
843e338755

+ 0 - 6
src/Calendar.ts

@@ -136,12 +136,6 @@ export default class Calendar {
   }
 
 
-  // public API :(
-  getView(): View {
-    return this.view // calls getter
-  }
-
-
   // Public API for rendering
   // -----------------------------------------------------------------------------------------------------------------
 

+ 1 - 1
tests/automated/legacy/View.js

@@ -12,7 +12,7 @@ describe('View object', function() {
 
     it('is a correctly defined string', function() {
       initCalendar()
-      var view = currentCalendar.getView()
+      var view = currentCalendar.view
       expect(view.title).toBe('January 2015')
     })
 

+ 6 - 6
tests/automated/legacy/current-date.js

@@ -176,7 +176,7 @@ describe('current date', function() {
         options.now = options.defaultDate = '2014-06-01' // a Sunday
         options.weekends = false
         initCalendar(options)
-        var view = currentCalendar.getView()
+        var view = currentCalendar.view
         expect(view.activeStart).toEqualDate('2014-06-02')
         expect(view.activeEnd).toEqualDate('2014-07-12')
         expect(view.currentStart).toEqualDate('2014-06-01')
@@ -187,7 +187,7 @@ describe('current date', function() {
         options.now = options.defaultDate = '2014-05-04' // a Sunday
         options.weekends = false
         initCalendar(options)
-        var view = currentCalendar.getView()
+        var view = currentCalendar.view
         expect(view.activeStart).toEqualDate('2014-04-28')
         expect(view.activeEnd).toEqualDate('2014-06-07')
         expect(view.currentStart).toEqualDate('2014-05-01')
@@ -199,11 +199,11 @@ describe('current date', function() {
           options.defaultDate = '2014-07-07'
           options.weekends = false
           initCalendar(options)
-          var view = currentCalendar.getView()
+          var view = currentCalendar.view
           expect(view.currentStart).toEqualDate('2014-07-01')
           expect(view.currentEnd).toEqualDate('2014-08-01')
           currentCalendar.prev() // will move to Jun 1, which is a Sunday
-          view = currentCalendar.getView()
+          view = currentCalendar.view
           expect(view.currentStart).toEqualDate('2014-06-01')
           expect(view.currentEnd).toEqualDate('2014-07-01')
         })
@@ -215,7 +215,7 @@ describe('current date', function() {
         options.now = options.defaultDate = '2014-06-01' // a Sunday
         options.weekends = false
         initCalendar(options)
-        var view = currentCalendar.getView()
+        var view = currentCalendar.view
         expect(view.activeStart).toEqualDate('2014-06-02')
         expect(view.activeEnd).toEqualDate('2014-06-03')
         expect(view.currentStart).toEqualDate('2014-06-02')
@@ -250,7 +250,7 @@ describe('current date', function() {
   }
 
   function expectViewDates(start, end, titleStart, titleEnd) {
-    var view = currentCalendar.getView()
+    var view = currentCalendar.view
     var calculatedEnd
     var title
 

+ 6 - 6
tests/automated/legacy/eventLimitClick.js

@@ -42,7 +42,7 @@ describe('eventLimitClick', function() { // simulate a click
         }
       })
       $('.fc-more').simulate('click')
-      var view = currentCalendar.getView()
+      var view = currentCalendar.view
       expect(view.type).toBe('basicWeek')
     })
 
@@ -55,7 +55,7 @@ describe('eventLimitClick', function() { // simulate a click
         }
       })
       $('.fc-more').simulate('click')
-      var view = currentCalendar.getView()
+      var view = currentCalendar.view
       expect(view.type).toBe('agendaWeek')
     })
   })
@@ -75,7 +75,7 @@ describe('eventLimitClick', function() { // simulate a click
         }
       })
       $('.fc-more').simulate('click')
-      var view = currentCalendar.getView()
+      var view = currentCalendar.view
       expect(view.type).toBe('basicDay')
     })
 
@@ -88,7 +88,7 @@ describe('eventLimitClick', function() { // simulate a click
         }
       })
       $('.fc-more').simulate('click')
-      var view = currentCalendar.getView()
+      var view = currentCalendar.view
       expect(view.type).toBe('agendaDay')
     })
   })
@@ -103,7 +103,7 @@ describe('eventLimitClick', function() { // simulate a click
       }
     })
     $('.fc-more').simulate('click')
-    var view = currentCalendar.getView()
+    var view = currentCalendar.view
     expect(view.type).toBe('agendaWeek')
   })
 
@@ -129,7 +129,7 @@ describe('eventLimitClick', function() { // simulate a click
       }
     })
     $('.fc-more').simulate('click')
-    var view = currentCalendar.getView()
+    var view = currentCalendar.view
     expect(view.type).toBe('agendaDay')
   })
 

+ 1 - 1
tests/automated/legacy/viewDestroy.js

@@ -32,7 +32,7 @@ describe('datesDestroy', function() {
             // the datesDestroy should be called before the next datesRender
             expect(datesRenderCalls).toBe(1)
 
-            var viewObj = currentCalendar.getView()
+            var viewObj = currentCalendar.view
             var viewEl = $('.fc-view', currentCalendar.el)
 
             expect(viewObj).toBe(arg.view)

+ 1 - 1
tests/automated/legacy/viewRender.js

@@ -23,7 +23,7 @@ describe('datesRender', function() {
     it('fires after the view is rendered, with correct arguments', function(done) {
       initCalendar({
         datesRender: function(arg) {
-          var viewObj = currentCalendar.getView()
+          var viewObj = currentCalendar.view
           var viewEl = $('.fc-view', currentCalendar.el)
 
           expect(viewObj).toBe(arg.view)

+ 2 - 2
tests/automated/view-dates/ViewDateUtils.js

@@ -1,6 +1,6 @@
 
 export function expectRenderRange(start, end) {
-  var currentView = currentCalendar.getView()
+  var currentView = currentCalendar.view
   var dateProfile = currentView.props.dateProfile
 
   expect(dateProfile.renderRange.start).toEqualDate(start)
@@ -9,7 +9,7 @@ export function expectRenderRange(start, end) {
 
 
 export function expectActiveRange(start, end) {
-  var currentView = currentCalendar.getView()
+  var currentView = currentCalendar.view
   var dateProfile = currentView.props.dateProfile
 
   expect(dateProfile.activeRange.start).toEqualDate(start)

+ 4 - 4
tests/manual/profiling.html

@@ -104,8 +104,8 @@
       var calendar = $('#calendar').fullCalendar('getCalendar');
       calendar.changeView('month');
 
-      var date = calendar.getView().start.clone();
-      var end = calendar.getView().end.clone();
+      var date = calendar.view.start.clone();
+      var end = calendar.view.end.clone();
       var events = [];
 
       while (date.isBefore(end)) {
@@ -148,8 +148,8 @@
       var calendar = $('#calendar').fullCalendar('getCalendar');
       calendar.changeView('agendaWeek');
 
-      var date = calendar.getView().start.clone();
-      var end = calendar.getView().end.clone();
+      var date = calendar.view.start.clone();
+      var end = calendar.view.end.clone();
       var events = [];
       var time;
       var calendar;