renalware-core 2.0.123 → 2.0.124

data/lib/renalware/engine.rb

@@ -53,7 +53,6 @@ require "trix"
 require "uglifier"
 require "validates_timeliness"
 require "virtus"
-require "webpacker"
 require "wicked_pdf"
 require "wisper"
 require "wisper/activejob"
@@ -65,36 +64,9 @@ module Renalware
   # This will keep Rails Engine from generating all table prefixes with the engines name
   def self.table_name_prefix; end
 
-  # rubocop:disable Metrics/ClassLength
   class Engine < ::Rails::Engine
     isolate_namespace Renalware
 
-    # Configure webpacker dev server proxy
-    # rubocop:disable Style/RescueStandardError
-    initializer "webpacker.proxy" do |app|
-      insert_middleware = begin
-                            Renalware.webpacker.config.dev_server.present?
-                          rescue
-                            nil
-                          end
-      next unless insert_middleware
-
-      app.middleware.insert_before(
-        0, Webpacker::DevServerProxy, # "Webpacker::DevServerProxy" if Rails version < 5
-        ssl_verify_none: true,
-        webpacker: Renalware.webpacker
-      )
-    end
-    # rubocop:enable Style/RescueStandardError
-
-    # Allow the host app to consume webpacker-compiled packs in the engine's public folder.
-    initializer :packs do |_app|
-      config.app_middleware.use(
-        Rack::Static,
-        urls: ["/renalware-core-packs"], root: Engine.root.join("public")
-      )
-    end
-
     # Define a attr on the Engine's eigenclass so a host application
     # can set an exception handler instance. It must accept a .notify(excetion) method.
     # We use the exception handler when logging errors in background jobs only.
@@ -150,37 +122,9 @@ module Renalware
     end
 
     initializer :assets do |app|
-      app.config.assets.precompile += %w(renalware/print/pathology_request_forms.css)
-      app.config.assets.precompile += %w(renalware/modernizr.js)
-      app.config.assets.precompile += %w(renalware/charting/charting.js)
-      app.config.assets.precompile += %w(renalware/iframeResizer.contentWindow.js)
-      app.config.assets.precompile += %w(renalware/pdf.css renalware/watermark.css)
-      app.config.assets.precompile += %w(renalware/protocol_pdf.css)
-      app.config.assets.precompile += %w(renalware/medications_pdf.css)
-      app.config.assets.precompile += %w(renalware/medications/prescriptions_pdf.css)
-      app.config.assets.precompile += %w(renalware/hd_diary_pdf.css)
-      app.config.assets.precompile += %w(renalware/table_pdf.css)
-      app.config.assets.precompile += %w(
-        renalware/nhs_a4_letter_logo_blue.png
-        renalware/nhs_a4_letter_logo_black.png
-        renalware/NHS-Black.jpg
-        renalware/favicon/manifest.json
-        renalware/favicon/apple-touch-icon.png
-        renalware/favicon/favicon-32x32.png
-        renalware/favicon/favicon-16x16.png
-        renalware/favicon/favicon.ico
-        renalware/favicon/android-chrome-192x192.png
-        renalware/favicon/android-chrome-512x512.png
-        renalware/favicon/mstile-150x150.png
-        renalware/favicon/safari-pinned-tab.svg
-        renalware/clippy.svg
-        renalware/print-button-example.png
-        renalware/hd/mr_victor.jpg
-        renalware/hd/avf_avg_assessment.jpg
-        renalware/loading-gears-animation.gif
-      )
-      app.config.assets.paths <<
-        Rails.root.join(config.root, "vendor", "assets", "javascripts", "renalware")
+      # Add some extra paths so sprocket asset directives can locate dependent files
+      vendor_js_path = Rails.root.join(config.root, "vendor", "assets", "javascripts", "renalware")
+      app.config.assets.paths << vendor_js_path
       app.config.assets.paths << Engine.root.join("node_modules")
     end
 
@@ -222,4 +166,3 @@ module Renalware
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.123"
+  VERSION = "2.0.124"
 end

data/lib/tasks/renalware.rake

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-def ensure_log_goes_to_stdout
-  old_logger = Webpacker.logger
-  Webpacker.logger = ActiveSupport::Logger.new(STDOUT)
-  yield
-ensure
-  Webpacker.logger = old_logger
-end
-
 namespace :renalware do
   desc "Install package.json dependencies with yarn for the renalware-core engine - "\
        "without this <path to installed gem>/renalware-core/node_modules is not populated "\
@@ -18,99 +10,10 @@ namespace :renalware do
       system "yarn install --no-progress --production"
     end
   end
-
-  desc "Cleans the Webpack output folder (public/renalware-core-packs)"
-  task :clean_webpack_output_folder do
-    puts "Destroying packs output folder ..."
-    Dir.chdir(File.join(__dir__, "..", "..")) do
-      # TODO : Load packs output from config/webpacker.yml
-      system "rm -rf public/renalware-core-packs"
-    end
-  end
-
-  # I have found that it is necessary to force remove public/renalware-core-packs with the
-  # clean_webpack_output_folder task above before compiling, otherwise webpack does not
-  # always find changes in js/controllers/*.js. I think this is safe to do in a capistrano deploy
-  # because the symlink to public is only applied after a successful execution of (among other
-  # things) assets:precompile.
-  desc "Compile JavaScript packs using webpack for production with digests"
-  task webpacker_compile: %i(clean_webpack_output_folder yarn_install environment) do
-    puts "Compiling renalware-core packs with webpack.."
-    if Rails.env.development? || Rails.env.test?
-      compile_webpacker_output
-    else
-      temporarily_point_webpacker_config_public_root_path_to_rails_app_root do
-        compile_webpacker_output
-      end
-    end
-  end
-end
-
-def compile_webpacker_output
-  Webpacker.with_node_env("production") do
-    ensure_log_goes_to_stdout do
-      if Renalware.webpacker.commands.compile
-        # Successful compilation!
-      else
-        # Failed compilation
-        exit!
-      end
-    end
-  end
-end
-
-# This is something of a hack to get webpacker to compile the renalware-core-packs in the
-# host Rails app's public folder. We change out config/webpacker.yml to point to the host app's
-# public path, do the compile, then revert out change.
-# The downside of this approach is that if running staging or production env locally without
-# nginx to find and serve public/renalware-core-packs, the pack files will not be found by the host
-# because the Rack::Static middleware we setup in engine.rb will not find them.
-# An alternative is for us to do the compile inside the engine and then cp -R or rsync (better
-# if we are symlinking renawlare-core-packs to shared in deploy.rb) the
-# folder into the host's public app where it can be served by nginx (if configured).
-# This has the advantage that the same files are available in the engine's public folder (so they
-# can be servered by Rack::Static - see engine.rb) and also in the host apps public folder
-# where nginx can server them if we are in a real 'environment'
-def temporarily_point_webpacker_config_public_root_path_to_rails_app_root
-  engine_config_folder = Renalware::Engine.root.join("config")
-  find = "public_root_path: .*$"
-  replace = "public_root_path: #{Rails.root.join('public')}"
-
-  # This changes the contents of file, creating a backup in webpacker.yml.bak
-  `ruby -pi.bak -e "gsub(/#{find}/, '#{replace}')" #{engine_config_folder}/webpacker.yml`
-
-  yield if block_given?
-ensure
-  # Ensure that we always restore the backup webpacker.yml
-  FileUtils.mv(
-    engine_config_folder.join("webpacker.yml.bak"),
-    engine_config_folder.join("webpacker.yml")
-  )
-end
-
-def enhance_assets_precompile_with_renalware_webpacker_compile
-  # Becuase of an issue deploying BLT (not affecting KCH for some reason) I am temporarily
-  # removing the engine webpacker_precompile and insterad just doing yarn_install.
-  # The utter mess of webpacker in an engine means I think that I will need to publish a
-  # @renalware/core npm package at gem publish time and reference that from the host app.
-  # Rake::Task["assets:precompile"].enhance(["renalware:webpacker_compile"])
-  Rake::Task["assets:precompile"].enhance(["renalware:yarn_install"])
 end
 
-# When a host app runs rake assets:precompile, hook into this and enhance the
-# task so it runs webpacker install for (and relative to) the engine, wherever it is installed.
-# Without that, assets:precompile will fail because the engine references various js and css files
-# in ./node_modules, and these are not included in the source, but need to be installed with yarn
-# at deploy time.
-#
-# Note that when runnning in the engine in development, we need to set the ENV
-# var WEBPACKER_PRECOMPILE=no (e.g. in ./.env) otherwise wepacker will enhance the
-# 'assets:precompile' task with 'webpacker:compile' task, and the latter task does not exist
-# in out context (for us its called app:webpacker:compile).
-# A possible downside of this is that webpacker compilation in the dummy app, if ever required, may
-# not work, I'm not sure.
-if Rake::Task.task_defined?("assets:precompile")
-  enhance_assets_precompile_with_renalware_webpacker_compile
+if Rake::Task.task_defined?("yarn:install")
+  Rake::Task["yarn:install"].enhance(["renalware:yarn_install"])
 else
-  Rake::Task.define_task("assets:precompile" => "renalware:webpacker:compile")
+  Rake::Task.define_task("yarn:install" => "renalware:yarn_install")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.123
+  version: 2.0.124
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component
@@ -828,14 +828,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -974,6 +974,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/renalware/core/manifest.js
 - app/assets/images/renalware/NHS-Black.jpg
 - app/assets/images/renalware/ajax-loader.gif
 - app/assets/images/renalware/barts_health_nhs_logo.png
@@ -995,60 +996,66 @@ files:
 - app/assets/images/renalware/favicon/safari-pinned-tab.svg
 - app/assets/images/renalware/hd/avf_avg_assessment.jpg
 - app/assets/images/renalware/hd/mr_victor.jpg
+- app/assets/images/renalware/icons/chevron-down.svg
+- app/assets/images/renalware/icons/chevron-up.svg
+- app/assets/images/renalware/icons/chevrons-down.svg
+- app/assets/images/renalware/icons/chevrons-up.svg
 - app/assets/images/renalware/kidney.png
 - app/assets/images/renalware/loading-gears-animation.gif
 - app/assets/images/renalware/nhs_a4_letter_logo_black.png
 - app/assets/images/renalware/nhs_a4_letter_logo_blue.png
 - app/assets/images/renalware/print-button-example.png
-- app/assets/javascripts/renalware/ajax_errors.js
-- app/assets/javascripts/renalware/aki_alerts.js
-- app/assets/javascripts/renalware/application.js.erb
-- app/assets/javascripts/renalware/appointments.js
-- app/assets/javascripts/renalware/behaviours.js
-- app/assets/javascripts/renalware/charting/charting.js.erb
-- app/assets/javascripts/renalware/clipboard_setup.js
-- app/assets/javascripts/renalware/clockpicker.js
-- app/assets/javascripts/renalware/contacts.js
-- app/assets/javascripts/renalware/dialogs.js.erb
-- app/assets/javascripts/renalware/drugs.js
-- app/assets/javascripts/renalware/events.js
-- app/assets/javascripts/renalware/feed_only_inputs.js.erb
-- app/assets/javascripts/renalware/feeds.js
-- app/assets/javascripts/renalware/forms.js
-- app/assets/javascripts/renalware/full_screen.js
-- app/assets/javascripts/renalware/hd.js
-- app/assets/javascripts/renalware/iframe.js
-- app/assets/javascripts/renalware/keyboard_shortcuts.js
-- app/assets/javascripts/renalware/layout.js
-- app/assets/javascripts/renalware/letters.js
-- app/assets/javascripts/renalware/masonry.run.js
-- app/assets/javascripts/renalware/messaging.js
-- app/assets/javascripts/renalware/modality_codes.js
-- app/assets/javascripts/renalware/modality_reasons.js
-- app/assets/javascripts/renalware/navigation.js
-- app/assets/javascripts/renalware/patient_ajax_search.js
-- app/assets/javascripts/renalware/patient_menu.js
-- app/assets/javascripts/renalware/pd.js
-- app/assets/javascripts/renalware/pdf.js
-- app/assets/javascripts/renalware/person_ajax_search.js
-- app/assets/javascripts/renalware/primary_care_physician_search.js
-- app/assets/javascripts/renalware/primary_care_physicians.js
-- app/assets/javascripts/renalware/problems.js
-- app/assets/javascripts/renalware/renal.js
-- app/assets/javascripts/renalware/reporting.js.erb
-- app/assets/javascripts/renalware/searchables.js
-- app/assets/javascripts/renalware/select2-ajax-search.js
-- app/assets/javascripts/renalware/session_timeout_redirect.js.erb
-- app/assets/javascripts/renalware/sortable.js
-- app/assets/javascripts/renalware/table.js
-- app/assets/javascripts/renalware/tabs.js
-- app/assets/javascripts/renalware/toggler.js
-- app/assets/javascripts/renalware/transplants.js
+- app/assets/javascripts/renalware/README.md
+- app/assets/javascripts/renalware/charting.js
+- app/assets/javascripts/renalware/components/ajax_errors.js
+- app/assets/javascripts/renalware/components/aki_alerts.js
+- app/assets/javascripts/renalware/components/appointments.js
+- app/assets/javascripts/renalware/components/behaviours.js
+- app/assets/javascripts/renalware/components/bla.es6
+- app/assets/javascripts/renalware/components/clipboard_setup.js
+- app/assets/javascripts/renalware/components/clockpicker.js
+- app/assets/javascripts/renalware/components/contacts.js
+- app/assets/javascripts/renalware/components/dialogs.js.erb
+- app/assets/javascripts/renalware/components/drugs.js
+- app/assets/javascripts/renalware/components/events.js
+- app/assets/javascripts/renalware/components/feed_only_inputs.js.erb
+- app/assets/javascripts/renalware/components/feeds.js
+- app/assets/javascripts/renalware/components/forms.js
+- app/assets/javascripts/renalware/components/full_screen.js
+- app/assets/javascripts/renalware/components/hd.js
+- app/assets/javascripts/renalware/components/iframe.js
+- app/assets/javascripts/renalware/components/keyboard_shortcuts.js
+- app/assets/javascripts/renalware/components/layout.js
+- app/assets/javascripts/renalware/components/letters.js
+- app/assets/javascripts/renalware/components/masonry.run.js
+- app/assets/javascripts/renalware/components/messaging.js
+- app/assets/javascripts/renalware/components/modality_codes.js
+- app/assets/javascripts/renalware/components/modality_reasons.js
+- app/assets/javascripts/renalware/components/navigation.js
+- app/assets/javascripts/renalware/components/patient_ajax_search.js
+- app/assets/javascripts/renalware/components/patient_menu.js
+- app/assets/javascripts/renalware/components/pd.js
+- app/assets/javascripts/renalware/components/pdf.js
+- app/assets/javascripts/renalware/components/person_ajax_search.js
+- app/assets/javascripts/renalware/components/primary_care_physician_search.js
+- app/assets/javascripts/renalware/components/primary_care_physicians.js
+- app/assets/javascripts/renalware/components/problems.js
+- app/assets/javascripts/renalware/components/renal.js
+- app/assets/javascripts/renalware/components/reporting.js.erb
+- app/assets/javascripts/renalware/components/searchables.js
+- app/assets/javascripts/renalware/components/select2-ajax-search.js
+- app/assets/javascripts/renalware/components/session_timeout_redirect.js.erb
+- app/assets/javascripts/renalware/components/sortable.js
+- app/assets/javascripts/renalware/components/table.js
+- app/assets/javascripts/renalware/components/tabs.js
+- app/assets/javascripts/renalware/components/toggler.js
+- app/assets/javascripts/renalware/components/transplants.js
+- app/assets/javascripts/renalware/core.js.erb
 - app/assets/pdf/blank_page.pdf
-- app/assets/stylesheets/renalware/application.scss
+- app/assets/stylesheets/renalware/README.md
 - app/assets/stylesheets/renalware/base/_mixins.scss
 - app/assets/stylesheets/renalware/base/_variables.scss
-- app/assets/stylesheets/renalware/clipboard.scss
+- app/assets/stylesheets/renalware/core.scss
 - app/assets/stylesheets/renalware/hd_diary_pdf.scss
 - app/assets/stylesheets/renalware/lib/_clockpicker.css
 - app/assets/stylesheets/renalware/lib/_foundation_and_overrides.scss
@@ -1084,6 +1091,7 @@ files:
 - app/assets/stylesheets/renalware/partials/_autocomplete.scss
 - app/assets/stylesheets/renalware/partials/_beta_banner.scss
 - app/assets/stylesheets/renalware/partials/_button.scss
+- app/assets/stylesheets/renalware/partials/_clipboard.scss
 - app/assets/stylesheets/renalware/partials/_clockpicker.scss
 - app/assets/stylesheets/renalware/partials/_components.scss
 - app/assets/stylesheets/renalware/partials/_datepicker.scss
@@ -1107,11 +1115,12 @@ files:
 - app/assets/stylesheets/renalware/partials/_tables.scss
 - app/assets/stylesheets/renalware/partials/_tabs.scss
 - app/assets/stylesheets/renalware/partials/_toggle.scss
+- app/assets/stylesheets/renalware/partials/_toggling.scss
 - app/assets/stylesheets/renalware/partials/_tooltip.scss
 - app/assets/stylesheets/renalware/partials/_typography.scss
 - app/assets/stylesheets/renalware/partials/_utilities.scss
+- app/assets/stylesheets/renalware/pathology_request_forms.scss
 - app/assets/stylesheets/renalware/pdf.scss
-- app/assets/stylesheets/renalware/print/pathology_request_forms.scss
 - app/assets/stylesheets/renalware/protocol_pdf.scss
 - app/assets/stylesheets/renalware/table_pdf.scss
 - app/assets/stylesheets/renalware/watermark.scss
@@ -1345,6 +1354,7 @@ files:
 - app/helpers/renalware/infection_organisms_helper.rb
 - app/helpers/renalware/layout_helper.rb
 - app/helpers/renalware/letters_helper.rb
+- app/helpers/renalware/link_helper.rb
 - app/helpers/renalware/mdm_helper.rb
 - app/helpers/renalware/navigation_helper.rb
 - app/helpers/renalware/patient_helper.rb
@@ -1374,8 +1384,7 @@ files:
 - app/inputs/select_container_input.rb
 - app/inputs/simple_time_input.rb
 - app/inputs/user_picker_input.rb
-- app/javascript/controllers/clipboard_controller.js
-- app/javascript/packs/renalware_core.js
+- app/javascript/controllers/clipboard_controller.js.dead
 - app/jobs/application_job.rb
 - app/jobs/feed_job.rb
 - app/jobs/hl7_message_example.txt
@@ -1420,6 +1429,7 @@ files:
 - app/models/concerns/renalware/personable.rb
 - app/models/concerns/renalware/string_logging.rb
 - app/models/concerns/renalware/supersedeable.rb
+- app/models/concerns/renalware/transaction_retry.rb
 - app/models/concerns/renalware/using_temp_folder.rb
 - app/models/null_exception_notifier.rb
 - app/models/renalware.rb
@@ -3186,11 +3196,6 @@ files:
 - config/routes/virology.rb
 - config/schedule.rb.example
 - config/spring.rb
-- config/webpack/development.js
-- config/webpack/environment.js
-- config/webpack/production.js
-- config/webpack/test.js
-- config/webpacker.yml
 - db/functions/audit_view_as_json_v01.sql
 - db/functions/convert_to_float_v01.sql
 - db/functions/count_estimate_v01.sql

data/app/assets/javascripts/renalware/clockpicker.js

@@ -1,742 +0,0 @@
-/*!
- * This file moved (and its .css counterpart) to app/assets (rather than included via a gem or
- * living in ./vendor) because we have fixed a bug here and I want to make it explicit
- * that we now have ownership of both files, and to prevent them being accidentally
- * refreshed and thereby losing our changes.
- *
- * ClockPicker v0.0.7 (http://weareoutman.github.io/clockpicker/)
- * Copyright 2014 Wang Shenwei.
- * Licensed under MIT (https://github.com/weareoutman/clockpicker/blob/gh-pages/LICENSE)
- */
-
-;(function(){
-	var $ = window.jQuery,
-		$win = $(window),
-		$doc = $(document),
-		$body;
-
-	// Can I use inline svg ?
-	var svgNS = 'http://www.w3.org/2000/svg',
-		svgSupported = 'SVGAngle' in window && (function(){
-			var supported,
-				el = document.createElement('div');
-			el.innerHTML = '<svg/>';
-			supported = (el.firstChild && el.firstChild.namespaceURI) == svgNS;
-			el.innerHTML = '';
-			return supported;
-		}());
-
-	// Can I use transition ?
-	var transitionSupported = (function(){
-		var style = document.createElement('div').style;
-		return 'transition' in style ||
-			'WebkitTransition' in style ||
-			'MozTransition' in style ||
-			'msTransition' in style ||
-			'OTransition' in style;
-	}());
-
-	// Listen touch events in touch screen device, instead of mouse events in desktop.
-	var touchSupported = 'ontouchstart' in window,
-		mousedownEvent = 'mousedown' + ( touchSupported ? ' touchstart' : ''),
-		mousemoveEvent = 'mousemove.clockpicker' + ( touchSupported ? ' touchmove.clockpicker' : ''),
-		mouseupEvent = 'mouseup.clockpicker' + ( touchSupported ? ' touchend.clockpicker' : '');
-
-	// Vibrate the device if supported
-	var vibrate = navigator.vibrate ? 'vibrate' : navigator.webkitVibrate ? 'webkitVibrate' : null;
-
-	function createSvgElement(name) {
-		return document.createElementNS(svgNS, name);
-	}
-
-	function leadingZero(num) {
-		return (num < 10 ? '0' : '') + num;
-	}
-
-	// Get a unique id
-	var idCounter = 0;
-	function uniqueId(prefix) {
-		var id = ++idCounter + '';
-		return prefix ? prefix + id : id;
-	}
-
-	// Clock size
-	var dialRadius = 100,
-		outerRadius = 80,
-		// innerRadius = 80 on 12 hour clock
-		innerRadius = 54,
-		tickRadius = 13,
-		diameter = dialRadius * 2,
-		duration = transitionSupported ? 350 : 1;
-
-	// Popover template
-	var tpl = [
-		'<div class="popover clockpicker-popover">',
-			'<div class="arrow"></div>',
-			'<div class="popover-title">',
-				'<span class="clockpicker-span-hours text-primary"></span>',
-				' : ',
-				'<span class="clockpicker-span-minutes"></span>',
-				'<span class="clockpicker-span-am-pm"></span>',
-			'</div>',
-			'<div class="popover-content">',
-				'<div class="clockpicker-plate">',
-					'<div class="clockpicker-canvas"></div>',
-					'<div class="clockpicker-dial clockpicker-hours"></div>',
-					'<div class="clockpicker-dial clockpicker-minutes clockpicker-dial-out"></div>',
-				'</div>',
-				'<span class="clockpicker-am-pm-block">',
-				'</span>',
-			'</div>',
-		'</div>'
-	].join('');
-
-	// ClockPicker
-	function ClockPicker(element, options) {
-		var popover = $(tpl),
-			plate = popover.find('.clockpicker-plate'),
-			hoursView = popover.find('.clockpicker-hours'),
-			minutesView = popover.find('.clockpicker-minutes'),
-			amPmBlock = popover.find('.clockpicker-am-pm-block'),
-			isInput = element.prop('tagName') === 'INPUT',
-			input = isInput ? element : element.find('input'),
-			addon = element.find('.input-group-addon .prefix'),
-			self = this,
-			timer;
-
-		this.id = uniqueId('cp');
-		this.element = element;
-		this.options = options;
-		this.isAppended = false;
-		this.isShown = false;
-		this.currentView = 'hours';
-		this.isInput = isInput;
-		this.input = input;
-		this.addon = addon;
-		this.popover = popover;
-		this.plate = plate;
-		this.hoursView = hoursView;
-		this.minutesView = minutesView;
-		this.amPmBlock = amPmBlock;
-		this.spanHours = popover.find('.clockpicker-span-hours');
-		this.spanMinutes = popover.find('.clockpicker-span-minutes');
-		this.spanAmPm = popover.find('.clockpicker-span-am-pm');
-		this.amOrPm = "PM";
-
-		// Setup for for 12 hour clock if option is selected
-		if (options.twelvehour) {
-
-			var  amPmButtonsTemplate = ['<div class="clockpicker-am-pm-block">',
-				'<button type="button" class="btn btn-sm btn-default clockpicker-button clockpicker-am-button">',
-				'AM</button>',
-				'<button type="button" class="btn btn-sm btn-default clockpicker-button clockpicker-pm-button">',
-				'PM</button>',
-				'</div>'].join('');
-
-			var amPmButtons = $(amPmButtonsTemplate);
-			//amPmButtons.appendTo(plate);
-
-			////Not working b/c they are not shown when this runs
-			//$('clockpicker-am-button')
-			//    .on("click", function() {
-			//        self.amOrPm = "AM";
-			//        $('.clockpicker-span-am-pm').empty().append('AM');
-			//    });
-			//
-			//$('clockpicker-pm-button')
-			//    .on("click", function() {
-			//         self.amOrPm = "PM";
-			//        $('.clockpicker-span-am-pm').empty().append('PM');
-			//    });
-
-			$('<button type="button" class="btn btn-sm btn-default clockpicker-button am-button">' + "AM" + '</button>')
-				.on("click", function() {
-					self.amOrPm = "AM";
-					$('.clockpicker-span-am-pm').empty().append('AM');
-				}).appendTo(this.amPmBlock);
-
-
-			$('<button type="button" class="btn btn-sm btn-default clockpicker-button pm-button">' + "PM" + '</button>')
-				.on("click", function() {
-					self.amOrPm = 'PM';
-					$('.clockpicker-span-am-pm').empty().append('PM');
-				}).appendTo(this.amPmBlock);
-
-		}
-
-		if (! options.autoclose) {
-			// If autoclose is not setted, append a button
-			$('<button type="button" class="btn btn-sm btn-default btn-block clockpicker-button">' + options.donetext + '</button>')
-				.click($.proxy(this.done, this))
-				.appendTo(popover);
-		}
-
-		// Placement and arrow align - make sure they make sense.
-		if ((options.placement === 'top' || options.placement === 'bottom') && (options.align === 'top' || options.align === 'bottom')) options.align = 'left';
-		if ((options.placement === 'left' || options.placement === 'right') && (options.align === 'left' || options.align === 'right')) options.align = 'top';
-
-		popover.addClass(options.placement);
-		popover.addClass('clockpicker-align-' + options.align);
-
-		this.spanHours.click($.proxy(this.toggleView, this, 'hours'));
-		this.spanMinutes.click($.proxy(this.toggleView, this, 'minutes'));
-
-		// Show or toggle
-		input.on('focus.clockpicker click.clockpicker', $.proxy(this.show, this));
-		addon.on('click.clockpicker', $.proxy(this.toggle, this));
-
-		// Build ticks
-		var tickTpl = $('<div class="clockpicker-tick"></div>'),
-			i, tick, radian, radius;
-
-		// Hours view
-		if (options.twelvehour) {
-			for (i = 1; i < 13; i += 1) {
-				tick = tickTpl.clone();
-				radian = i / 6 * Math.PI;
-				radius = outerRadius;
-				tick.css('font-size', '120%');
-				tick.css({
-					left: dialRadius + Math.sin(radian) * radius - tickRadius,
-					top: dialRadius - Math.cos(radian) * radius - tickRadius
-				});
-				tick.html(i === 0 ? '00' : i);
-				hoursView.append(tick);
-				tick.on(mousedownEvent, mousedown);
-			}
-		} else {
-			for (i = 0; i < 24; i += 1) {
-				tick = tickTpl.clone();
-				radian = i / 6 * Math.PI;
-				var inner = i > 0 && i < 13;
-				radius = inner ? innerRadius : outerRadius;
-				tick.css({
-					left: dialRadius + Math.sin(radian) * radius - tickRadius,
-					top: dialRadius - Math.cos(radian) * radius - tickRadius
-				});
-				if (inner) {
-					tick.css('font-size', '120%');
-				}
-				tick.html(i === 0 ? '00' : i);
-				hoursView.append(tick);
-				tick.on(mousedownEvent, mousedown);
-			}
-		}
-
-		// Minutes view
-		for (i = 0; i < 60; i += 5) {
-			tick = tickTpl.clone();
-			radian = i / 30 * Math.PI;
-			tick.css({
-				left: dialRadius + Math.sin(radian) * outerRadius - tickRadius,
-				top: dialRadius - Math.cos(radian) * outerRadius - tickRadius
-			});
-			tick.css('font-size', '120%');
-			tick.html(leadingZero(i));
-			minutesView.append(tick);
-			tick.on(mousedownEvent, mousedown);
-		}
-
-		// Clicking on minutes view space
-		plate.on(mousedownEvent, function(e){
-			if ($(e.target).closest('.clockpicker-tick').length === 0) {
-				mousedown(e, true);
-			}
-		});
-
-		// Mousedown or touchstart
-		function mousedown(e, space) {
-			var offset = plate.offset(),
-				isTouch = /^touch/.test(e.type),
-				x0 = offset.left + dialRadius,
-				y0 = offset.top + dialRadius,
-				dx = (isTouch ? e.originalEvent.touches[0] : e).pageX - x0,
-				dy = (isTouch ? e.originalEvent.touches[0] : e).pageY - y0,
-				z = Math.sqrt(dx * dx + dy * dy),
-				moved = false;
-
-			// When clicking on minutes view space, check the mouse position
-			if (space && (z < outerRadius - tickRadius || z > outerRadius + tickRadius)) {
-				return;
-			}
-			e.preventDefault();
-
-			// Set cursor style of body after 200ms
-			var movingTimer = setTimeout(function(){
-				$body.addClass('clockpicker-moving');
-			}, 200);
-
-			// Place the canvas to top
-			if (svgSupported) {
-				plate.append(self.canvas);
-			}
-
-			// Clock
-			self.setHand(dx, dy, ! space, true);
-
-			// Mousemove on document
-			$doc.off(mousemoveEvent).on(mousemoveEvent, function(e){
-				e.preventDefault();
-				var isTouch = /^touch/.test(e.type),
-					x = (isTouch ? e.originalEvent.touches[0] : e).pageX - x0,
-					y = (isTouch ? e.originalEvent.touches[0] : e).pageY - y0;
-				if (! moved && x === dx && y === dy) {
-					// Clicking in chrome on windows will trigger a mousemove event
-					return;
-				}
-				moved = true;
-				self.setHand(x, y, false, true);
-			});
-
-			// Mouseup on document
-			$doc.off(mouseupEvent).on(mouseupEvent, function(e){
-				$doc.off(mouseupEvent);
-				e.preventDefault();
-				var isTouch = /^touch/.test(e.type),
-					x = (isTouch ? e.originalEvent.changedTouches[0] : e).pageX - x0,
-					y = (isTouch ? e.originalEvent.changedTouches[0] : e).pageY - y0;
-				if ((space || moved) && x === dx && y === dy) {
-					self.setHand(x, y);
-				}
-				if (self.currentView === 'hours') {
-					self.toggleView('minutes', duration / 2);
-				} else {
-					if (options.autoclose) {
-						self.minutesView.addClass('clockpicker-dial-out');
-						setTimeout(function(){
-							self.done();
-						}, duration / 2);
-					}
-				}
-				plate.prepend(canvas);
-
-				// Reset cursor style of body
-				clearTimeout(movingTimer);
-				$body.removeClass('clockpicker-moving');
-
-				// Unbind mousemove event
-				$doc.off(mousemoveEvent);
-			});
-		}
-
-		if (svgSupported) {
-			// Draw clock hands and others
-			var canvas = popover.find('.clockpicker-canvas'),
-				svg = createSvgElement('svg');
-			svg.setAttribute('class', 'clockpicker-svg');
-			svg.setAttribute('width', diameter);
-			svg.setAttribute('height', diameter);
-			var g = createSvgElement('g');
-			g.setAttribute('transform', 'translate(' + dialRadius + ',' + dialRadius + ')');
-			var bearing = createSvgElement('circle');
-			bearing.setAttribute('class', 'clockpicker-canvas-bearing');
-			bearing.setAttribute('cx', 0);
-			bearing.setAttribute('cy', 0);
-			bearing.setAttribute('r', 2);
-			var hand = createSvgElement('line');
-			hand.setAttribute('x1', 0);
-			hand.setAttribute('y1', 0);
-			var bg = createSvgElement('circle');
-			bg.setAttribute('class', 'clockpicker-canvas-bg');
-			bg.setAttribute('r', tickRadius);
-			var fg = createSvgElement('circle');
-			fg.setAttribute('class', 'clockpicker-canvas-fg');
-			fg.setAttribute('r', 3.5);
-			g.appendChild(hand);
-			g.appendChild(bg);
-			g.appendChild(fg);
-			g.appendChild(bearing);
-			svg.appendChild(g);
-			canvas.append(svg);
-
-			this.hand = hand;
-			this.bg = bg;
-			this.fg = fg;
-			this.bearing = bearing;
-			this.g = g;
-			this.canvas = canvas;
-		}
-
-		raiseCallback(this.options.init);
-	}
-
-	function raiseCallback(callbackFunction) {
-		if (callbackFunction && typeof callbackFunction === "function") {
-			callbackFunction();
-		}
-	}
-
-	// Default options
-	ClockPicker.DEFAULTS = {
-		'default': '',       // default time, 'now' or '13:14' e.g.
-		fromnow: 0,          // set default time to * milliseconds from now (using with default = 'now')
-		placement: 'bottom', // clock popover placement
-		align: 'left',       // popover arrow align
-		donetext: '完成',    // done button text
-		autoclose: false,    // auto close when minute is selected
-		twelvehour: false, // change to 12 hour AM/PM clock from 24 hour
-		vibrate: true        // vibrate the device when dragging clock hand
-	};
-
-	// Show or hide popover
-	ClockPicker.prototype.toggle = function(){
-		this[this.isShown ? 'hide' : 'show']();
-	};
-
-	// Set popover position
-	ClockPicker.prototype.locate = function(){
-		var element = this.element,
-			popover = this.popover,
-			offset = element.offset(),
-			width = element.outerWidth(),
-			height = element.outerHeight(),
-			placement = this.options.placement,
-			align = this.options.align,
-			styles = {},
-			self = this;
-
-		popover.show();
-
-		// Place the popover
-		switch (placement) {
-			case 'bottom':
-				styles.top = offset.top + height;
-				break;
-			case 'right':
-				styles.left = offset.left + width;
-				break;
-			case 'top':
-				styles.top = offset.top - popover.outerHeight();
-				break;
-			case 'left':
-				styles.left = offset.left - popover.outerWidth();
-				break;
-		}
-
-		// Align the popover arrow
-		switch (align) {
-			case 'left':
-				styles.left = offset.left;
-				break;
-			case 'right':
-				styles.left = offset.left + width - popover.outerWidth();
-				break;
-			case 'top':
-				styles.top = offset.top;
-				break;
-			case 'bottom':
-				styles.top = offset.top + height - popover.outerHeight();
-				break;
-		}
-
-		popover.css(styles);
-	};
-
-	// Show popover
-	ClockPicker.prototype.show = function(e){
-		// Not show again
-		if (this.isShown) {
-			return;
-		}
-
-		raiseCallback(this.options.beforeShow);
-
-		var self = this;
-
-		// Initialize
-		if (! this.isAppended) {
-			// Append popover to body
-			$body = $(document.body).append(this.popover);
-
-			// Reset position when resize
-			$win.on('resize.clockpicker' + this.id, function(){
-				if (self.isShown) {
-					self.locate();
-				}
-			});
-
-			this.isAppended = true;
-		}
-
-		// Get the time
-		var value = ((this.input.prop('value') || this.options['default'] || '') + '').split(':');
-		if (value[0] === 'now') {
-			var now = new Date(+ new Date() + this.options.fromnow);
-			value = [
-				now.getHours(),
-				now.getMinutes()
-			];
-		}
-		this.hours = + value[0] || 0;
-		this.minutes = + value[1] || 0;
-		this.spanHours.html(leadingZero(this.hours));
-		this.spanMinutes.html(leadingZero(this.minutes));
-
-		// Toggle to hours view
-		this.toggleView('hours');
-
-		// Set position
-		this.locate();
-
-		this.isShown = true;
-
-		// Hide when clicking or tabbing on any element except the clock, input and addon
-		$doc.on('click.clockpicker.' + this.id + ' focusin.clockpicker.' + this.id, function(e){
-
-			/* TC 13/7/17
-			Fixed a bug here - changed
-				target.closest(self.addon).length === 0 &&
-			to
-				target.closest(self.addon.selector).length === 0 &&
-			Without this it is not possible to click on the clock icon to open the popover.
-			*/
-			var target = $(e.target);
-			if (target.closest(self.popover).length === 0 &&
-					target.closest(self.addon.selector).length === 0 &&
-					target.closest(self.input).length === 0) {
-				self.hide();
-			}
-		});
-
-		// Hide when ESC is pressed
-		$doc.on('keyup.clockpicker.' + this.id, function(e){
-			if (e.keyCode === 27) {
-				self.hide();
-			}
-		});
-
-		raiseCallback(this.options.afterShow);
-	};
-
-	// Hide popover
-	ClockPicker.prototype.hide = function(){
-		raiseCallback(this.options.beforeHide);
-
-		this.isShown = false;
-
-		// Unbinding events on document
-		$doc.off('click.clockpicker.' + this.id + ' focusin.clockpicker.' + this.id);
-		$doc.off('keyup.clockpicker.' + this.id);
-
-		this.popover.hide();
-
-		raiseCallback(this.options.afterHide);
-	};
-
-	// Toggle to hours or minutes view
-	ClockPicker.prototype.toggleView = function(view, delay){
-		var raiseAfterHourSelect = false;
-		if (view === 'minutes' && $(this.hoursView).css("visibility") === "visible") {
-			raiseCallback(this.options.beforeHourSelect);
-			raiseAfterHourSelect = true;
-		}
-		var isHours = view === 'hours',
-			nextView = isHours ? this.hoursView : this.minutesView,
-			hideView = isHours ? this.minutesView : this.hoursView;
-
-		this.currentView = view;
-
-		this.spanHours.toggleClass('text-primary', isHours);
-		this.spanMinutes.toggleClass('text-primary', ! isHours);
-
-		// Let's make transitions
-		hideView.addClass('clockpicker-dial-out');
-		nextView.css('visibility', 'visible').removeClass('clockpicker-dial-out');
-
-		// Reset clock hand
-		this.resetClock(delay);
-
-		// After transitions ended
-		clearTimeout(this.toggleViewTimer);
-		this.toggleViewTimer = setTimeout(function(){
-			hideView.css('visibility', 'hidden');
-		}, duration);
-
-		if (raiseAfterHourSelect) {
-			raiseCallback(this.options.afterHourSelect);
-		}
-	};
-
-	// Reset clock hand
-	ClockPicker.prototype.resetClock = function(delay){
-		var view = this.currentView,
-			value = this[view],
-			isHours = view === 'hours',
-			unit = Math.PI / (isHours ? 6 : 30),
-			radian = value * unit,
-			radius = isHours && value > 0 && value < 13 ? innerRadius : outerRadius,
-			x = Math.sin(radian) * radius,
-			y = - Math.cos(radian) * radius,
-			self = this;
-		if (svgSupported && delay) {
-			self.canvas.addClass('clockpicker-canvas-out');
-			setTimeout(function(){
-				self.canvas.removeClass('clockpicker-canvas-out');
-				self.setHand(x, y);
-			}, delay);
-		} else {
-			this.setHand(x, y);
-		}
-	};
-
-	// Set clock hand to (x, y)
-	ClockPicker.prototype.setHand = function(x, y, roundBy5, dragging){
-		var radian = Math.atan2(x, - y),
-			isHours = this.currentView === 'hours',
-			unit = Math.PI / (isHours || roundBy5 ? 6 : 30),
-			z = Math.sqrt(x * x + y * y),
-			options = this.options,
-			inner = isHours && z < (outerRadius + innerRadius) / 2,
-			radius = inner ? innerRadius : outerRadius,
-			value;
-
-			if (options.twelvehour) {
-				radius = outerRadius;
-			}
-
-		// Radian should in range [0, 2PI]
-		if (radian < 0) {
-			radian = Math.PI * 2 + radian;
-		}
-
-		// Get the round value
-		value = Math.round(radian / unit);
-
-		// Get the round radian
-		radian = value * unit;
-
-		// Correct the hours or minutes
-		if (options.twelvehour) {
-			if (isHours) {
-				if (value === 0) {
-					value = 12;
-				}
-			} else {
-				if (roundBy5) {
-					value *= 5;
-				}
-				if (value === 60) {
-					value = 0;
-				}
-			}
-		} else {
-			if (isHours) {
-				if (value === 12) {
-					value = 0;
-				}
-				value = inner ? (value === 0 ? 12 : value) : value === 0 ? 0 : value + 12;
-			} else {
-				if (roundBy5) {
-					value *= 5;
-				}
-				if (value === 60) {
-					value = 0;
-				}
-			}
-		}
-
-		// Once hours or minutes changed, vibrate the device
-		if (this[this.currentView] !== value) {
-			if (vibrate && this.options.vibrate) {
-				// Do not vibrate too frequently
-				if (! this.vibrateTimer) {
-					navigator[vibrate](10);
-					this.vibrateTimer = setTimeout($.proxy(function(){
-						this.vibrateTimer = null;
-					}, this), 100);
-				}
-			}
-		}
-
-		this[this.currentView] = value;
-		this[isHours ? 'spanHours' : 'spanMinutes'].html(leadingZero(value));
-
-		// If svg is not supported, just add an active class to the tick
-		if (! svgSupported) {
-			this[isHours ? 'hoursView' : 'minutesView'].find('.clockpicker-tick').each(function(){
-				var tick = $(this);
-				tick.toggleClass('active', value === + tick.html());
-			});
-			return;
-		}
-
-		// Place clock hand at the top when dragging
-		if (dragging || (! isHours && value % 5)) {
-			this.g.insertBefore(this.hand, this.bearing);
-			this.g.insertBefore(this.bg, this.fg);
-			this.bg.setAttribute('class', 'clockpicker-canvas-bg clockpicker-canvas-bg-trans');
-		} else {
-			// Or place it at the bottom
-			this.g.insertBefore(this.hand, this.bg);
-			this.g.insertBefore(this.fg, this.bg);
-			this.bg.setAttribute('class', 'clockpicker-canvas-bg');
-		}
-
-		// Set clock hand and others' position
-		var cx = Math.sin(radian) * radius,
-			cy = - Math.cos(radian) * radius;
-		this.hand.setAttribute('x2', cx);
-		this.hand.setAttribute('y2', cy);
-		this.bg.setAttribute('cx', cx);
-		this.bg.setAttribute('cy', cy);
-		this.fg.setAttribute('cx', cx);
-		this.fg.setAttribute('cy', cy);
-	};
-
-	// Hours and minutes are selected
-	ClockPicker.prototype.done = function() {
-		raiseCallback(this.options.beforeDone);
-		this.hide();
-		var last = this.input.prop('value'),
-			value = leadingZero(this.hours) + ':' + leadingZero(this.minutes);
-		if  (this.options.twelvehour) {
-			value = value + this.amOrPm;
-		}
-
-		this.input.prop('value', value);
-		if (value !== last) {
-			this.input.triggerHandler('change');
-			if (! this.isInput) {
-				this.element.trigger('change');
-			}
-		}
-
-		if (this.options.autoclose) {
-			this.input.trigger('blur');
-		}
-
-		raiseCallback(this.options.afterDone);
-	};
-
-	// Remove clockpicker from input
-	ClockPicker.prototype.remove = function() {
-		this.element.removeData('clockpicker');
-		this.input.off('focus.clockpicker click.clockpicker');
-		this.addon.off('click.clockpicker');
-		if (this.isShown) {
-			this.hide();
-		}
-		if (this.isAppended) {
-			$win.off('resize.clockpicker' + this.id);
-			this.popover.remove();
-		}
-	};
-
-	// Extends $.fn.clockpicker
-	$.fn.clockpicker = function(option){
-		var args = Array.prototype.slice.call(arguments, 1);
-		return this.each(function(){
-			var $this = $(this),
-				data = $this.data('clockpicker');
-			if (! data) {
-				var options = $.extend({}, ClockPicker.DEFAULTS, $this.data(), typeof option == 'object' && option);
-				$this.data('clockpicker', new ClockPicker($this, options));
-			} else {
-				// Manual operatsions. show, hide, remove, e.g.
-				if (typeof data[option] === 'function') {
-					data[option].apply(data, args);
-				}
-			}
-		});
-	};
-}());