updated date picker to v1.12.1

Edirom · Sep 18, 2016 · e24b7f1 · e24b7f1
1 parent de024d7
commit e24b7f1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -21,7 +21,8 @@
     "Easy-Responsive-Tabs-to-Accordion": "samsono/Easy-Responsive-Tabs-to-Accordion",
     "bootstrap-hover-dropdown": "CWSpear/bootstrap-hover-dropdown",
     "bootstrap-remote-data":"LeaseWeb/bootstrap-remote-data#d9bd5d61ac3c0a3b3b59511f935bc29462d6f620",
-    "jquery-ui": ">= 1.11.4",
+    "jquery-ui": ">= 1.12.1",
+    "datepicker-fr": ">= 1.12.1",
     "moment": ">= 2.10.2",
     "ionrangeslider": ">= 2.0.6",
     "leaflet-iiif": ">= 0.0.7",

diff --git a/build.xml b/build.xml
@@ -140,6 +140,14 @@
             <mapper type="glob" from="*.js" to="*-min.js"/>
             <targetfile/>
         </apply>
+        <apply executable="java" parallel="false" dest="${dist.dir}/resources/lib/datepicker-fr/ui/widgets">
+            <fileset dir="${dist.dir}/resources/lib/datepicker-fr/ui/widgets" includes="datepicker.js" excludes="*min.js"/>
+            <arg line="-jar ${yuicompress.jar} -v"/>
+            <srcfile/>
+            <arg line="-o"/>
+            <mapper type="glob" from="*.js" to="*-min.js"/>
+            <targetfile/>
+        </apply>
     </target>
 
     <target name="xar" depends="init, dist, yuicompress">

diff --git a/resources/js/init.js b/resources/js/init.js
@@ -549,7 +549,7 @@ function getLanguage() {
 /* Get the current diary date from the h1 heading */
 function getDiaryDate() {
     /* Datumsangabe auf Listenseite (h3) oder auf Einzelansicht (h1) */
-    var title = ($('h1.document').length === 0)? $('h3.media-heading a').html().replace('<br>', '') : $('h1.document').html().replace('<br>', '') ,
+    var title = ($('h1.document').length === 0)? $('h3.media-heading a').html().replace(/<br.+/, '') : $('h1.document').html().replace(/<br.+/, '') ,
 		 lang = getLanguage(),
 		 format,
 		 date = '';

diff --git a/templates/page.html b/templates/page.html
@@ -249,8 +249,8 @@
         <script type="text/javascript" src="$resources/js/jquery.loadmask.js" data-template="app:if-matches" data-template-key="environment" data-template-value="development"/>
         <script type="text/javascript" src="$resources/js/jquery.loadmask-min.js" data-template="app:if-not-matches" data-template-key="environment" data-template-value="development"/>
         <script type="text/javascript" src="$resources/lib/bootstrap-remote-data/js/bootstrap-remote-tabs.min.js"/>
-        <script type="text/javascript" src="$resources/lib/jquery-ui/ui/minified/datepicker.min.js"/>
-        <script type="text/javascript" src="$resources/lib/jquery-ui/ui/minified/i18n/datepicker-de.min.js"/>
+        <script type="text/javascript" src="$resources/lib/datepicker-fr/ui/widgets/datepicker-min.js"/>
+        <script type="text/javascript" src="$resources/lib/datepicker-fr/ui/i18n/datepicker-de.js"/>
         <script type="text/javascript" src="$resources/lib/google-code-prettify/bin/prettify.min.js"/>
         <script type="text/javascript" src="$resources/lib/selectize/dist/js/standalone/selectize.min.js"/>
         <script type="text/javascript" src="$resources/lib/moment/min/moment-with-locales.min.js"/>