Skip to content

Commit

Permalink
Merge pull request #96 from nextcloud/fix-import
Browse files Browse the repository at this point in the history
fix import by changing random color call
  • Loading branch information
georgehrke authored Sep 27, 2016
2 parents 7193457 + a3b5d34 commit 8c471dd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions js/app/controllers/importcontroller.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
* Description: Takes care of importing calendars
*/

app.controller('ImportController', ['$scope', '$filter', 'CalendarService', 'VEventService', '$uibModalInstance', 'files', 'ImportFileWrapper',
function($scope, $filter, CalendarService, VEventService, $uibModalInstance, files, ImportFileWrapper) {
app.controller('ImportController', ['$scope', '$filter', 'CalendarService', 'VEventService', '$uibModalInstance', 'files', 'ImportFileWrapper', 'ColorUtility',
function($scope, $filter, CalendarService, VEventService, $uibModalInstance, files, ImportFileWrapper, ColorUtility) {
'use strict';

$scope.nameSize = 25;
Expand Down Expand Up @@ -60,7 +60,7 @@ app.controller('ImportController', ['$scope', '$filter', 'CalendarService', 'VEv

if (fileWrapper.selectedCalendar === 'new') {
var name = fileWrapper.splittedICal.name || fileWrapper.file.name;
var color = fileWrapper.splittedICal.color || randColour(); // jshint ignore:line
var color = fileWrapper.splittedICal.color || ColorUtility.randomColor();

var components = [];
if (fileWrapper.splittedICal.vevents.length > 0) {
Expand Down

0 comments on commit 8c471dd

Please sign in to comment.