BUG Correct include paths for legacy JS files

silverstripe · Jul 28, 2016 · a868ecd · a868ecd
1 parent 6e74b57
commit a868ecd
Show file tree

Hide file tree

Showing 28 changed files with 118 additions and 113 deletions.
diff --git a/admin/client/dist/js/bundle-lib.js b/admin/client/dist/js/bundle-lib.js
diff --git a/client/dist/js/AssetUploadField.js b/client/dist/js/AssetUploadField.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.AssetUploadField', ['../jQuery'], factory);
+		define('ss.AssetUploadField', ['jQuery'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'));
+		factory(require('jQuery'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/dist/js/ConfirmedPasswordField.js b/client/dist/js/ConfirmedPasswordField.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.ConfirmedPasswordField', ['../jQuery'], factory);
+		define('ss.ConfirmedPasswordField', ['jQuery'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'));
+		factory(require('jQuery'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/dist/js/DateField.js b/client/dist/js/DateField.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.DateField', ['../jQuery'], factory);
+		define('ss.DateField', ['jQuery'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'));
+		factory(require('jQuery'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/dist/js/GridField.js b/client/dist/js/GridField.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.GridField', ['../jQuery', '../i18n'], factory);
+		define('ss.GridField', ['jQuery', 'i18n'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'), require('../i18n'));
+		factory(require('jQuery'), require('i18n'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/dist/js/HtmlEditorField.js b/client/dist/js/HtmlEditorField.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.HtmlEditorField', ['../jQuery', '../i18n'], factory);
+		define('ss.HtmlEditorField', ['jQuery', 'i18n'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'), require('../i18n'));
+		factory(require('jQuery'), require('i18n'));
 	} else {
 		var mod = {
 			exports: {}
@@ -368,7 +368,7 @@
 				this.resetFileField();
 
 				this.find('div.content .field').hide();
-				this.find('.field[id$="LinkType"]').show();
+				this.find('.field[id$="LinkType_Holder"]').show();
 				this.find('.field[id$="' + linkType + '_Holder"]').show();
 
 				if (linkType == 'internal' || linkType == 'anchor') {

diff --git a/client/dist/js/PermissionCheckboxSetField.js b/client/dist/js/PermissionCheckboxSetField.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.PermissionCheckboxSetField', ['../jQuery'], factory);
+		define('ss.PermissionCheckboxSetField', ['jQuery'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'));
+		factory(require('jQuery'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/dist/js/SelectionGroup.js b/client/dist/js/SelectionGroup.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define('ss.SelectionGroup', ['../jQuery'], factory);
+    define('ss.SelectionGroup', ['jQuery'], factory);
   } else if (typeof exports !== "undefined") {
-    factory(require('../jQuery'));
+    factory(require('jQuery'));
   } else {
     var mod = {
       exports: {}

diff --git a/client/dist/js/TabSet.js b/client/dist/js/TabSet.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.TabSet', ['../jQuery'], factory);
+		define('ss.TabSet', ['jQuery'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'));
+		factory(require('jQuery'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/dist/js/ToggleCompositeField.js b/client/dist/js/ToggleCompositeField.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.ToggleCompositeField', ['../jQuery'], factory);
+		define('ss.ToggleCompositeField', ['jQuery'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'));
+		factory(require('jQuery'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/dist/js/ToggleField.js b/client/dist/js/ToggleField.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.ToggleField', ['../jQuery'], factory);
+		define('ss.ToggleField', ['jQuery'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'));
+		factory(require('jQuery'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/dist/js/TreeDropdownField.js b/client/dist/js/TreeDropdownField.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.TreeDropdownField', ['../jQuery', '../i18n'], factory);
+		define('ss.TreeDropdownField', ['jQuery', 'i18n'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'), require('../i18n'));
+		factory(require('jQuery'), require('i18n'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/dist/js/UploadField.js b/client/dist/js/UploadField.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.UploadField', ['../jQuery', '../i18n'], factory);
+		define('ss.UploadField', ['jQuery', 'i18n'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'), require('../i18n'));
+		factory(require('jQuery'), require('i18n'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/dist/js/UploadField_select.js b/client/dist/js/UploadField_select.js
@@ -1,8 +1,8 @@
 (function (global, factory) {
 	if (typeof define === "function" && define.amd) {
-		define('ss.UploadField_select', ['../jQuery'], factory);
+		define('ss.UploadField_select', ['jQuery'], factory);
 	} else if (typeof exports !== "undefined") {
-		factory(require('../jQuery'));
+		factory(require('jQuery'));
 	} else {
 		var mod = {
 			exports: {}

diff --git a/client/src/legacy/AssetUploadField.js b/client/src/legacy/AssetUploadField.js
@@ -1,4 +1,4 @@
-import $ from '../jQuery';
+import $ from 'jQuery';
 
 $('.ss-assetuploadfield').entwine({
 	onmatch: function() {

diff --git a/client/src/legacy/ConfirmedPasswordField.js b/client/src/legacy/ConfirmedPasswordField.js
@@ -1,11 +1,11 @@
-import $ from '../jQuery';
+import $ from 'jQuery';
 
 $(document).on('click', '.confirmedpassword .showOnClick a', function () {
 	var $container = $('.showOnClickContainer', $(this).parent());
 
 	$container.toggle('fast', function() {
 		$container.find('input[type="hidden"]').val($container.is(":visible") ? 1 : 0);
 	});
-	
+
 	return false;
 });
diff --git a/client/src/legacy/DateField.js b/client/src/legacy/DateField.js
@@ -1,13 +1,13 @@
-import $ from '../jQuery';
+import $ from 'jQuery';
 
 $.fn.extend({
 	ssDatepicker: function(opts) {
 		return $(this).each(function() {
 			if($(this).data('datepicker')) return; // already applied
 
 			$(this).siblings("button").addClass("ui-icon ui-icon-calendar");
-			
-			var holder = $(this).parents('.field.date:first'), 
+
+			var holder = $(this).parents('.field.date:first'),
 				config = $.extend(opts || {}, $(this).data(), $(this).data('jqueryuiconfig'), {});
 			if(!config.showcalendar) return;
 
@@ -18,7 +18,7 @@ $.fn.extend({
 			if(config.min) config.minDate = $.datepicker.parseDate('yy-mm-dd', config.min);
 			if(config.max) config.maxDate = $.datepicker.parseDate('yy-mm-dd', config.max);
 
-			// Initialize and open a datepicker 
+			// Initialize and open a datepicker
 			// live() doesn't have "onmatch", and jQuery.entwine is a bit too heavyweight for this, so we need to do this onclick.
 			config.dateFormat = config.jquerydateformat;
 			$(this).datepicker(config);

diff --git a/client/src/legacy/GridField.js b/client/src/legacy/GridField.js
@@ -1,5 +1,5 @@
-import $ from '../jQuery';
-import i18n from '../i18n';
+import $ from 'jQuery';
+import i18n from 'i18n';
 
 $.entwine('ss', function($) {
 	$('.ss-gridfield').entwine({

diff --git a/client/src/legacy/HtmlEditorField.js b/client/src/legacy/HtmlEditorField.js
@@ -6,8 +6,8 @@
  * ajax / iframe submissions
  */
 
-import $ from '../jQuery';
-import i18n from '../i18n';
+import $ from 'jQuery';
+import i18n from 'i18n';
 
 var ss = typeof window.ss !== 'undefined' ? window.ss : {};
 

diff --git a/client/src/legacy/PermissionCheckboxSetField.js b/client/src/legacy/PermissionCheckboxSetField.js
@@ -1,4 +1,4 @@
-import $ from '../jQuery';
+import $ from 'jQuery';
 
 $.entwine('ss', function($){
 	/**
@@ -40,7 +40,7 @@ $.entwine('ss', function($){
 
 	/**
 	 * Automatically check all "CMS section" checkboxes when "Access to all CMS interfaces" is ticked.
-	 * 
+	 *
 	 * @todo This should really be abstracted into a declarative dependency system
 	 * instead of custom logic.
 	 */

diff --git a/client/src/legacy/SelectionGroup.js b/client/src/legacy/SelectionGroup.js
@@ -1,4 +1,4 @@
-import $ from '../jQuery';
+import $ from 'jQuery';
 
 $(document).ready(function() {
   // Support both bootstrap / legacy selectors

diff --git a/client/src/legacy/TabSet.js b/client/src/legacy/TabSet.js
@@ -1,4 +1,4 @@
-import $ from '../jQuery';
+import $ from 'jQuery';
 
 $.entwine('ss', function($){
 	/**
@@ -65,7 +65,7 @@ $.entwine('ss', function($){
 		rewriteHashlinks: function() {
 			$(this).find('ul a').each(function() {
 				if (!$(this).attr('href')) return;
-				
+
 				var matches = $(this).attr('href').match(/#.*/);
 				if(!matches) return;
 				$(this).attr('href', document.location.href.replace(/#.*/, '') + matches[0]);

diff --git a/client/src/legacy/ToggleCompositeField.js b/client/src/legacy/ToggleCompositeField.js
@@ -1,4 +1,4 @@
-import $ from '../jQuery';
+import $ from 'jQuery';
 
 $.entwine('ss', function($){
 	$('.ss-toggle').entwine({

diff --git a/client/src/legacy/ToggleField.js b/client/src/legacy/ToggleField.js
@@ -1,4 +1,4 @@
-import $ from '../jQuery';
+import $ from 'jQuery';
 
 var field = $('div.toggleField');