Convert DateTimePicker in angular module

camptocamp · Jan 20, 2018 · 13a0cfc · 13a0cfc
1 parent 04e03cf
commit 13a0cfc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/editing/attributescomponent.js b/src/editing/attributescomponent.js
@@ -5,7 +5,7 @@ goog.require('ol.events');
 goog.require('ngeo');
 goog.require('ngeo.misc.EventHelper');
 /** @suppress {extraRequire} */
-goog.require('ngeo.datetimepickerDirective');
+goog.require('ngeo.misc.datetimepickerComponent');
 
 
 ngeo.editing.attributesComponent = angular.module('ngeoAttributes', [

diff --git a/src/directives/datetimepicker.js → src/misc/datetimepickerComponent.js b/src/directives/datetimepicker.js → src/misc/datetimepickerComponent.js
@@ -1,9 +1,17 @@
-goog.provide('ngeo.datetimepickerDirective');
+goog.provide('ngeo.misc.datetimepickerComponent');
 
 goog.require('ngeo');
+goog.require('ngeo.misc.Time');
 
-// Don't forget to add module dependencies
 
+/**
+ * @type {!angular.Module}
+ */
+ngeo.misc.datetimepickerComponent = angular.module('ngeoDateTimePicker', [
+  ngeo.misc.Time.module.name,
+]);
+
+ngeo.module.requires.push(ngeo.misc.datetimepickerComponent.name);
 
 /**
  * A directive used to display a date or time picker
@@ -19,18 +27,18 @@ goog.require('ngeo');
  * @ngdoc directive
  * @ngname ngeoDatetimepicker
  */
-ngeo.datetimepickerDirective = function() {
+ngeo.misc.datetimepickerComponent.component_ = function() {
   return {
     restrict: 'A',
-    controller: ngeo.DatetimepickerController,
+    controller: ngeo.misc.datetimepickerComponent.component_,
     bindToController: true,
     scope: {
       'options': '<ngeoDatetimepickerOptions'
     }
   };
 };
 
-ngeo.module.directive('ngeoDatetimepicker', ngeo.datetimepickerDirective);
+ngeo.misc.datetimepickerComponent.directive('ngeoDateTimePicker', ngeo.misc.datetimepickerComponent.component_);
 
 
 /**
@@ -43,7 +51,7 @@ ngeo.module.directive('ngeoDatetimepicker', ngeo.datetimepickerDirective);
  * @ngdoc controller
  * @ngname ngeoDatetimepickerController
  */
-ngeo.DatetimepickerController = function($element, gettextCatalog) {
+ngeo.misc.datetimepickerComponent.Controller_ = function($element, gettextCatalog) {
   /**
    * @const {!jQuery}
    * @private
@@ -69,11 +77,14 @@ ngeo.DatetimepickerController = function($element, gettextCatalog) {
 /**
  * Initialize the directive.
  */
-ngeo.DatetimepickerController.prototype.$onInit = function() {
+ngeo.misc.datetimepickerComponent.Controller_.prototype.$onInit = function() {
   const lang = this.gettextCatalog_.getCurrentLanguage();
   $.datetimepicker.setLocale(lang);
   if (typeof this.options === 'string') {
     this.options = angular.fromJson(this.options);
   }
   this.element_.datetimepicker(this.options);
 };
+
+ngeo.misc.datetimepickerComponent.controller('ngeoDateTimePickerController',
+  ngeo.misc.datetimepickerComponent.Controller_);