SAK-33251 - Remove references to unused fluid from preferences tool (s…

…akaiproject#4694)
JackyCheungBoy · Aug 16, 2017 · 08d9ce3 · 08d9ce3
1 parent 7578d9b
commit 08d9ce3
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 63 deletions.
diff --git a/user/user-tool-prefs/tool/src/webapp/js/prefs.js b/user/user-tool-prefs/tool/src/webapp/js/prefs.js
@@ -297,61 +297,3 @@ resizeFrame = function (updown) {
 		window.console && console.log("no frame to resize");
 	  }
 	};
-
-
-
-
-//var demo = demo || {};
-(function ($, fluid) {
-    //fluid.setLogging(true);
-    initlayoutReorderer = function () {
-        fluid.reorderLayout("#layoutReorderer", {
-            listeners: {
-       	    	afterMove: function (args) {
-					//resize iframe in case one of the lists made the doc higher
-					resizeFrame('grow');
-					// uncheck any selection that was checked and then moved via mouse or kbd 
-					$(args).find('.selectSiteCheck').prop('checked',false);
-                    $('#movePanel').css('top','-999px');
-                    $('.siteSelected').removeClass('siteSelected')
-
-    		    var ids = '';
-                var newTitle1=$('.checkboxSelectMessage').text().replace('{1}',$('.checkboxFromMessFav').text())
-                var newTitle2=$('.checkboxSelectMessage').text().replace('{1}',$('.checkboxFromMessArc').text())
-
-		    jQuery('.col1 .last-login').each(function(idx, item) {
-                var $thisCheckbox =$(this).find(':checkbox');
-                var thisTitle = $(this).find('.siteLabel').text();
-                $thisCheckbox.attr('title',newTitle1.replace('{0}', thisTitle));
-
-                        if ( ids.length > 1 ) ids += ', ' ;
-            	        ids += item.id ; //xxx 
-    		    });
-            	    jQuery('input[name$=prefTabString]').val(ids);
-    		    var ids = '';  
-		    jQuery('.col2 .last-login').each(function(idx, item) {
-                var $thisCheckbox =$(this).find(':checkbox');
-                var thisTitle = $(this).find('.siteLabel').text();
-                $thisCheckbox.attr('title',newTitle2.replace('{0}', thisTitle));
-               if ( ids.length > 1 ) ids += ', ' ;
-        	        ids += item.id ; 
-    		    });
-            	    jQuery('input[name$=prefHiddenString]').val(ids);
-       	        }
-	    },
-            selectors: {
-                lockedModules: ".layoutReorderer-locked"
-            },
-            styles: {
-                defaultStyle: "layoutReorderer-movable-default",
-                selected: "layoutReorderer-movable-selected",
-                dragging: "layoutReorderer-movable-dragging",
-                mouseDrag: "layoutReorderer-movable-mousedrag",
-                dropMarker: "layoutReorderer-dropMarker",
-                avatar: "layoutReorderer-avatar"
-            },
-            disableWrap: true
-        });
-    };
-})(jQuery, fluid);
-
diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/hidden.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/hidden.jsp
@@ -14,6 +14,8 @@
 	<sakai:view_content>
 		<h:form id="hidden_sites_form">
 
+                        <h:outputText value="#{Portal.latestJQuery}" escape="false"/>
+
                         <script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
                         <script type="text/javascript">
                                 $(document).ready(function(){
@@ -53,7 +55,6 @@
 
                         <p class="instruction"><h:outputText value="#{msgs.hidden_instructions}" escape="false" /></p>
 
-                        <h:outputText value="#{Portal.latestJQuery}" escape="false"/>
 
                         <div id="reallyHideConfirm" style="display: none">
                                 <h:outputText value="#{msgs.hidden_really_hide_confirm}" />

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/locale.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/locale.jsp
@@ -13,7 +13,6 @@
 	<sakai:view_content>
 		<h:form id="locale_form">
 <h:outputText value="#{Portal.latestJQuery}" escape="false"/>
-        <script type="text/javascript" src="/library/js/fluid/1.5/MyInfusion.js">//</script>
 		<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
 		<script type="text/javascript">
 			$(document).ready(function(){

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/noti_addSiteOverride.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/noti_addSiteOverride.jsp
@@ -12,7 +12,6 @@
 <f:verbatim>
 <h:outputText value="#{Portal.latestJQuery}" escape="false"/>
 <script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
-<script type="text/javascript" src="/library/js/fluid/1.5/MyInfusion.js">//</script>
 </f:verbatim>
 
 		<h:form id="site_list_form">

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/privacy.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/privacy.jsp
@@ -14,7 +14,6 @@
     <h:form>
       <!--SAK-18566 -->
 <h:outputText value="#{Portal.latestJQuery}" escape="false"/>
-        <script type="text/javascript" src="/library/js/fluid/1.5/MyInfusion.js">//</script>
 		<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
 		<script type="text/javascript">
 			$(document).ready(function(){

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/timezone.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/timezone.jsp
@@ -13,7 +13,6 @@
 	<sakai:view_content>
 		<h:form id="timezone_form">
 <h:outputText value="#{Portal.latestJQuery}" escape="false"/>
-        <script type="text/javascript" src="/library/js/fluid/1.5/MyInfusion.js">//</script>
 		<script type="text/javascript" src="/sakai-user-tool-prefs/js/prefs.js">// </script>
 		<script type="text/javascript">
 			$(document).ready(function(){