remove mootools from zoneminder

web/CMakeLists.txt

@@ -2,9 +2,6 @@
 
 # Process the api subdirectory
 add_subdirectory(api)
-# Process the tools/mootools subdirectory
-add_subdirectory(tools/mootools)
-
 # Create files from the .in files
 configure_file(includes/config.php.in "${CMAKE_CURRENT_BINARY_DIR}/includes/config.php" @ONLY)
 
@@ -20,9 +17,3 @@ if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/lib/Cake/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/lib/Cake")
 endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-
-# Install the mootools symlinks (if its not in the source directory)
-if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/mootools/mootools-core.js" DESTINATION "${ZM_WEBDIR}/tools/mootools")
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/mootools/mootools-more.js" DESTINATION "${ZM_WEBDIR}/tools/mootools")
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))

web/js/mootools.ext.js

@@ -1,16 +0,0 @@
-/*
- * MooTools Extension script to support custom extensions to mootools
- */
-var zmMooToolsVersion = '1.3.2';
-
-/*
- * Firstly, lets check that mootools has been included and thus is present
- */
-if ( typeof(MooTools) == "undefined" ) {
-  alert( "MooTools not found! Please check that it was installed correctly in ZoneMinder web root." );
-} else {
-  /* Version check */
-  if ( MooTools.version < zmMooToolsVersion ) {
-    alert( "MooTools version "+MooTools.version+" found.\nVersion "+zmMooToolsVersion+" required, please check that it was installed correctly in ZoneMinder web root." );
-  }
-}

web/skins/classic/includes/functions.php

@@ -863,11 +863,6 @@ function xhtmlFooter() {
   $viewJsFile = getSkinFile('views/js/'.$basename.'.js');
   $viewJsPhpFile = getSkinFile('views/js/'.$basename.'.js.php');
 ?>
-<?php if ( $basename != 'login' and $basename != 'postlogin' ) { ?>
-  <script src="tools/mootools/mootools-core.js"></script>
-  <script src="tools/mootools/mootools-more.js"></script>
-  <script src="js/mootools.ext.js"></script>
-<?php } ?>
   <script src="skins/<?php echo $skin; ?>/js/jquery.min.js"></script>
   <script src="skins/<?php echo $skin; ?>/js/jquery-ui-1.12.1/jquery-ui.min.js"></script>
   <script src="skins/<?php echo $skin; ?>/js/bootstrap.min.js"></script>

web/skins/classic/js/skin.js

@@ -247,22 +247,6 @@ if ( currentView != 'none' && currentView != 'login' ) {
     if ( $j('.navbar').length ) {
       setInterval(getNavBar, navBarRefresh);
     }
-    // Workaround Bootstrap-Mootools conflict
-    var bootstrapLoaded = (typeof $j().carousel == 'function');
-    var mootoolsLoaded = (typeof MooTools != 'undefined');
-    if (bootstrapLoaded && mootoolsLoaded) {
-      Element.implement({
-        hide: function() {
-          return this;
-        },
-        show: function(v) {
-          return this;
-        },
-        slide: function(v) {
-          return this;
-        }
-      });
-    }
     // Update zmBandwidth cookie when the user makes a selection from the dropdown
     bwClickFunction();
     // Update update reminders when the user makes a selection from the dropdown

web/tools/mootools/CMakeLists.txt

@@ -1,42 +0,0 @@
-# CMakeLists.txt for the Mootools
-# The only purpose of this file is to create the symlinks required.
-
-# Find the latest mootools-core version and create a symlink mootools-core.js to it
-file(GLOB mtcorelist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "mootools-core-*.js")
-if(NOT mtcorelist)
-	message(WARNING " Unable to find mootools-core files")
-else(NOT mtcorelist)
-	list(SORT mtcorelist)
-	list(LENGTH mtcorelist mtcorelistcount)
-	math(EXPR mtcoreindex "${mtcorelistcount} - 1")
-	list(GET mtcorelist ${mtcoreindex} mtcorelatest)
-	message(STATUS "Using mootools core file: ${mtcorelatest}")
-	execute_process(COMMAND ln -f -s "${mtcorelatest}" "${CMAKE_CURRENT_BINARY_DIR}/mootools-core.js" RESULT_VARIABLE mtcoreresult)
-	if(mtcoreresult)
-		message(WARNING " Failed creating the required symlinks for mootools-core. Exit code: ${mtcoreresult}")
-	endif(mtcoreresult)
-endif(NOT mtcorelist)
-
-# Find the latest mootools-more version and create a symlink mootools-more.js to it
-file(GLOB mtmorelist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "mootools-more-*.js")
-if(NOT mtmorelist)
-	message(WARNING " Unable to find mootools-more files")
-else(NOT mtmorelist)
-	list(SORT mtmorelist)
-	list(LENGTH mtmorelist mtmorelistcount)
-	math(EXPR mtmoreindex "${mtmorelistcount} - 1")
-	list(GET mtmorelist ${mtmoreindex} mtmorelatest)
-	message(STATUS "Using mootools more file: ${mtmorelatest}")
-	execute_process(COMMAND ln -f -s "${mtmorelatest}" "${CMAKE_CURRENT_BINARY_DIR}/mootools-more.js" RESULT_VARIABLE mtmoreresult)
-	if(mtmoreresult)
-		message(WARNING " Failed creating the required symlinks for mootools-more. Exit code: ${mtmoreresult}")
-	endif(mtmoreresult)
-endif(NOT mtmorelist)
-
-# If this is an out-of-source build, copy the mootools files we picked to the binary directory
-# This is required to fix a cmake bug regarding installing symlinks pointing to nonexistent files
-if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${mtcorelatest}" "${CMAKE_CURRENT_BINARY_DIR}/${mtcorelatest}")
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${mtmorelatest}" "${CMAKE_CURRENT_BINARY_DIR}/${mtmorelatest}")
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-

web/tools/mootools/mootools-core-compat.js.URL

@@ -1 +0,0 @@
-https://github.com/mootools/mootools-core/raw/1.6.0/dist/mootools-core-compat.js