Merge pull request #4355 from MrPetovan/task/4265-remove-jquery-migrate

Move js/ folder under view/
2018-01-28 22:38:03 +01:00 · 2018-01-28 22:38:03 +01:00 · 78de9d0022
parent 84dab1f290 cd392db078
commit 78de9d0022
72 changed files with 51 additions and 51 deletions
--- a/util/minifyjs.sh
+++ b/util/minifyjs.sh
@ -5,10 +5,10 @@ command -v uglifyjs >/dev/null 2>&1 || { echo >&2 "I require UglifyJS but it's n
 MINIFY_CMD=uglifyjs

 JSFILES=(
-	"js/acl.js"
-	"js/ajaxupload.js"
-	"js/country.js"
-	"js/main.js"
+	"view/js/acl.js"
+	"view/js/ajaxupload.js"
+	"view/js/country.js"
+	"view/js/main.js"
 	"vendor/asset/base64/base64.min.js"
 	"view/theme/frost/js/acl.js"
 	"view/theme/frost/js/jquery.divgrow-1.3.1.f1.js"
--- a/view/js/acl.js
+++ b/view/js/acl.js
--- a/view/js/ajaxupload.js
+++ b/view/js/ajaxupload.js
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
--- a/view/js/country.js
+++ b/view/js/country.js
--- a/view/js/cropper/cropper.css
+++ b/view/js/cropper/cropper.css
--- a/view/js/cropper/cropper.html
+++ b/view/js/cropper/cropper.html
--- a/view/js/cropper/cropper.js
+++ b/view/js/cropper/cropper.js
--- a/view/js/cropper/cropper.uncompressed.js
+++ b/view/js/cropper/cropper.uncompressed.js
--- a/view/js/cropper/lib/builder.js
+++ b/view/js/cropper/lib/builder.js
--- a/view/js/cropper/lib/controls.js
+++ b/view/js/cropper/lib/controls.js
--- a/view/js/cropper/lib/dragdrop.js
+++ b/view/js/cropper/lib/dragdrop.js
--- a/view/js/cropper/lib/effects.js
+++ b/view/js/cropper/lib/effects.js
--- a/view/js/cropper/lib/prototype.js
+++ b/view/js/cropper/lib/prototype.js
--- a/view/js/cropper/lib/scriptaculous.js
+++ b/view/js/cropper/lib/scriptaculous.js
--- a/view/js/cropper/lib/slider.js
+++ b/view/js/cropper/lib/slider.js
--- a/view/js/cropper/lib/unittest.js
+++ b/view/js/cropper/lib/unittest.js
--- a/view/js/cropper/licence.txt
+++ b/view/js/cropper/licence.txt
--- a/view/js/cropper/marqueeHoriz.gif
+++ b/view/js/cropper/marqueeHoriz.gif
--- a/view/js/cropper/marqueeVert.gif
+++ b/view/js/cropper/marqueeVert.gif
--- a/view/js/cropper/tests/castle.jpg
+++ b/view/js/cropper/tests/castle.jpg
--- a/view/js/cropper/tests/castleMed.jpg
+++ b/view/js/cropper/tests/castleMed.jpg
--- a/view/js/cropper/tests/example-Basic.htm
+++ b/view/js/cropper/tests/example-Basic.htm
--- a/view/js/cropper/tests/example-CSS-Absolute.htm
+++ b/view/js/cropper/tests/example-CSS-Absolute.htm
--- a/view/js/cropper/tests/example-CSS-Float.htm
+++ b/view/js/cropper/tests/example-CSS-Float.htm
--- a/view/js/cropper/tests/example-CSS-Relative.htm
+++ b/view/js/cropper/tests/example-CSS-Relative.htm
--- a/view/js/cropper/tests/example-CoordsOnLoad.htm
+++ b/view/js/cropper/tests/example-CoordsOnLoad.htm
--- a/view/js/cropper/tests/example-CoordsOnLoadWithRatio.htm
+++ b/view/js/cropper/tests/example-CoordsOnLoadWithRatio.htm
--- a/view/js/cropper/tests/example-Dimensions.htm
+++ b/view/js/cropper/tests/example-Dimensions.htm
--- a/view/js/cropper/tests/example-DynamicImage.htm
+++ b/view/js/cropper/tests/example-DynamicImage.htm
--- a/view/js/cropper/tests/example-FixedRatio.htm
+++ b/view/js/cropper/tests/example-FixedRatio.htm
--- a/view/js/cropper/tests/example-MinimumDimensions.htm
+++ b/view/js/cropper/tests/example-MinimumDimensions.htm
--- a/view/js/cropper/tests/example-MinimumWidth.htm
+++ b/view/js/cropper/tests/example-MinimumWidth.htm
--- a/view/js/cropper/tests/example-Preview.htm
+++ b/view/js/cropper/tests/example-Preview.htm
--- a/view/js/cropper/tests/poppy.jpg
+++ b/view/js/cropper/tests/poppy.jpg
--- a/view/js/cropper/tests/staticHTMLStructure.htm
+++ b/view/js/cropper/tests/staticHTMLStructure.htm
--- a/view/js/filebrowser.js
+++ b/view/js/filebrowser.js
--- a/view/js/jquery-textcomplete/CHANGELOG.md
+++ b/view/js/jquery-textcomplete/CHANGELOG.md
--- a/view/js/jquery-textcomplete/LICENSE
+++ b/view/js/jquery-textcomplete/LICENSE
--- a/view/js/jquery-textcomplete/README.md
+++ b/view/js/jquery-textcomplete/README.md
--- a/view/js/jquery-textcomplete/jquery.textcomplete.css
+++ b/view/js/jquery-textcomplete/jquery.textcomplete.css
--- a/view/js/jquery-textcomplete/jquery.textcomplete.js
+++ b/view/js/jquery-textcomplete/jquery.textcomplete.js
--- a/view/js/jquery-textcomplete/jquery.textcomplete.min.js
+++ b/view/js/jquery-textcomplete/jquery.textcomplete.min.js
--- a/view/js/jquery-textcomplete/jquery.textcomplete.min.map
+++ b/view/js/jquery-textcomplete/jquery.textcomplete.min.map
--- a/view/js/jquery.textinputs.js
+++ b/view/js/jquery.textinputs.js
--- a/view/js/main.js
+++ b/view/js/main.js
--- a/view/js/modernizr.js
+++ b/view/js/modernizr.js
--- a/view/templates/crophead.tpl
+++ b/view/templates/crophead.tpl
@ -1,4 +1,4 @@
-      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
+      <script type="text/javascript" src="view/js/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="view/js/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="view/js/cropper/cropper.js" language="javascript"></script>
+      <link rel="stylesheet" href="view/js/cropper/cropper.css" type="text/css" />
--- a/view/templates/filebrowser.tpl
+++ b/view/templates/filebrowser.tpl
@ -4,8 +4,8 @@
 <style>
 	#buglink_wrapper{display:none;} /* hide buglink. only in this page */
 </style>
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/filebrowser.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/filebrowser.js"></script>
 <script>
 	$(function() {
 		FileBrowser.init("{{$nickname}}", "{{$type}}");
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@ -33,18 +33,18 @@
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-<script type="text/javascript" src="js/modernizr.js" ></script>
+<script type="text/javascript" src="view/js/modernizr.js" ></script>
 <script type="text/javascript" src="vendor/asset/jquery/dist/jquery.min.js" ></script>
-<script type="text/javascript" src="js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="library/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
-<script type="text/javascript" src="js/autocomplete.js" ></script>
+<script type="text/javascript" src="view/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="view/js/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
+<script type="text/javascript" src="view/js/autocomplete.js" ></script>
 <script type="text/javascript" src="vendor/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
 <script type="text/javascript" src="vendor/asset/jgrowl/jquery.jgrowl.min.js"></script>
 <script type="text/javascript" src="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
 <script type="text/javascript" src="vendor/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js" ></script>
-<script type="text/javascript" src="js/acl.js" ></script>
+<script type="text/javascript" src="view/js/acl.js" ></script>
 <script type="text/javascript" src="vendor/asset/base64/base64.min.js" ></script>
-<script type="text/javascript" src="js/main.js" ></script>
+<script type="text/javascript" src="view/js/main.js" ></script>
 <script>

 	var updateInterval = {{$update_interval}};
--- a/view/templates/jot-header.tpl
+++ b/view/templates/jot-header.tpl
@ -40,7 +40,7 @@ function enableOnUser(){
 }

 </script>
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
 <script>
 	var ispublic = '{{$ispublic}}';

--- a/view/templates/msg-header.tpl
+++ b/view/templates/msg-header.tpl
@ -1,7 +1,7 @@
 <script language="javascript" type="text/javascript">
 	$("#prvmail-text").editor_autocomplete(baseurl + '/acl');
 </script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script type="text/javascript" src="view/js/ajaxupload.js" ></script>
 <script>
 	$(document).ready(function() {
 		var uploader = new window.AjaxUpload(
--- a/view/templates/profed_head.tpl
+++ b/view/templates/profed_head.tpl
@ -1 +1 @@
-<script type="text/javascript" src="js/country.js" ></script>
+<script type="text/javascript" src="view/js/country.js" ></script>
--- a/view/theme/frio/templates/filebrowser.tpl
+++ b/view/theme/frio/templates/filebrowser.tpl
@ -4,7 +4,7 @@
 <style>
 	#buglink_wrapper{display:none;} /* hide buglink. only in this page */
 </style>
-{{*<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>*}}
+{{*<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>*}}
 {{*<script type="text/javascript" src="view/theme/frio/js/filebrowser.js"></script>*}}

 <div class="fbrowser {{$type}}">
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@ -57,18 +57,18 @@
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-<script type="text/javascript" src="js/modernizr.js" ></script>
+<script type="text/javascript" src="view/js/modernizr.js" ></script>
 <script type="text/javascript" src="vendor/asset/jquery/dist/jquery.min.js"></script>
-<script type="text/javascript" src="js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="library/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
-<script type="text/javascript" src="js/autocomplete.js" ></script>
+<script type="text/javascript" src="view/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="view/js/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
+<script type="text/javascript" src="view/js/autocomplete.js" ></script>
 <script type="text/javascript" src="vendor/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
 <script type="text/javascript" src="vendor/asset/jgrowl/jquery.jgrowl.min.js"></script>
 <script type="text/javascript" src="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
 <script type="text/javascript" src="vendor/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js" ></script>
-<script type="text/javascript" src="js/acl.js" ></script>
+<script type="text/javascript" src="view/js/acl.js" ></script>
 <script type="text/javascript" src="vendor/asset/base64/base64.min.js" ></script>
-<script type="text/javascript" src="js/main.js" ></script>
+<script type="text/javascript" src="view/js/main.js" ></script>

 <script type="text/javascript" src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="view/theme/frio/frameworks/jasny/js/jasny-bootstrap.custom.js"></script>
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@ -1,5 +1,5 @@

-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>

 <script type="text/javascript">
 	var editor = false;
--- a/view/theme/frio/templates/theme_settings.tpl
+++ b/view/theme/frio/templates/theme_settings.tpl
@ -2,7 +2,7 @@
 <link rel="stylesheet" href="{{$baseurl}}/view/theme/frio/frameworks/jRange/jquery.range.css" type="text/css" media="screen" />
 <script src="{{$baseurl}}/view/theme/quattro/jquery.tools.min.js"></script>
 <script src="{{$baseurl}}/view/theme/frio/frameworks/jRange/jquery.range.js"></script>
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>

 {{include file="field_select.tpl" field=$schema}}

--- a/view/theme/frost-mobile/templates/cropend.tpl
+++ b/view/theme/frost-mobile/templates/cropend.tpl
@ -1,4 +1,4 @@
-      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+      <script type="text/javascript" src="view/js/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="view/js/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="view/js/cropper/cropper.js" language="javascript"></script>
      <script type="text/javascript" language="javascript">initCrop();</script>
--- a/view/theme/frost-mobile/templates/crophead.tpl
+++ b/view/theme/frost-mobile/templates/crophead.tpl
@ -1 +1 @@
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
+      <link rel="stylesheet" href="view/js/cropper/cropper.css" type="text/css" />
--- a/view/theme/frost-mobile/templates/end.tpl
+++ b/view/theme/frost-mobile/templates/end.tpl
@ -3,12 +3,12 @@
 <![endif]-->
 <script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery/dist/jquery.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/readmore.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/vendor/asset/jgrowl/jquery.jgrowl.min.js"></script>
 <script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>

-<script type="text/javascript" src="{{$baseurl}}/library/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/autocomplete.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/autocomplete.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/vendor/asset/base64/base64.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.js" ></script>
--- a/view/theme/frost-mobile/templates/jot-end.tpl
+++ b/view/theme/frost-mobile/templates/jot-end.tpl
@ -1,4 +1,4 @@
-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>

 <script language="javascript" type="text/javascript">if (typeof window.jotInit != 'undefined') initEditor();</script>

--- a/view/theme/frost-mobile/templates/msg-end.tpl
+++ b/view/theme/frost-mobile/templates/msg-end.tpl
@ -1,3 +1,3 @@

-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>

--- a/view/theme/frost-mobile/templates/profed_end.tpl
+++ b/view/theme/frost-mobile/templates/profed_end.tpl
@ -1,6 +1,6 @@


-<script type="text/javascript" src="js/country.js" ></script>
+<script type="text/javascript" src="view/js/country.js" ></script>

 <script language="javascript" type="text/javascript">
 	Fill_Country('{{$country_name}}');
--- a/view/theme/frost-mobile/templates/wallmsg-end.tpl
+++ b/view/theme/frost-mobile/templates/wallmsg-end.tpl
@ -1,3 +1,3 @@

-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>

--- a/view/theme/frost/templates/cropend.tpl
+++ b/view/theme/frost/templates/cropend.tpl
@ -1,4 +1,4 @@
-      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+      <script type="text/javascript" src="view/js/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="view/js/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="view/js/cropper/cropper.js" language="javascript"></script>
      <script type="text/javascript" language="javascript">initCrop();</script>
--- a/view/theme/frost/templates/crophead.tpl
+++ b/view/theme/frost/templates/crophead.tpl
@ -1 +1 @@
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
+      <link rel="stylesheet" href="view/js/cropper/cropper.css" type="text/css" />
--- a/view/theme/frost/templates/end.tpl
+++ b/view/theme/frost/templates/end.tpl
@ -5,15 +5,15 @@

 <script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery/dist/jquery.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
 <script type="text/javascript" src="{{$baseurl}}/vendor/asset/jgrowl/jquery.jgrowl.min.js"></script>
 <script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>

 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/vendor/asset/base64/base64.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/library/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/autocomplete.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/autocomplete.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/main.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/theme.js"></script>

--- a/view/theme/frost/templates/jot-end.tpl
+++ b/view/theme/frost/templates/jot-end.tpl
@ -1,4 +1,4 @@

-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>

 <script language="javascript" type="text/javascript">if(typeof window.jotInit != 'undefined') initEditor();</script>
--- a/view/theme/frost/templates/msg-end.tpl
+++ b/view/theme/frost/templates/msg-end.tpl
@ -1,4 +1,4 @@

-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>

 <script language="javascript" type="text/javascript">msgInitEditor();</script>
--- a/view/theme/frost/templates/profed_end.tpl
+++ b/view/theme/frost/templates/profed_end.tpl
@ -1,5 +1,5 @@

-<script type="text/javascript" src="js/country.js" ></script>
+<script type="text/javascript" src="view/js/country.js" ></script>

 <script language="javascript" type="text/javascript">
 Fill_Country('{{$country_name}}');
--- a/view/theme/frost/templates/wallmsg-end.tpl
+++ b/view/theme/frost/templates/wallmsg-end.tpl
@ -1,5 +1,5 @@

-<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>

 <script language="javascript" type="text/javascript">msgInitEditor();</script>

--- a/view/theme/smoothly/templates/jot-header.tpl
+++ b/view/theme/smoothly/templates/jot-header.tpl
@ -48,7 +48,7 @@ function enableOnUser(){

 </script>

-<script type="text/javascript" src="js/ajaxupload.js" >
+<script type="text/javascript" src="view/js/ajaxupload.js" >
 </script>

 <script>