From 649acb9833b9a2e68bda2db0ff36be599669950d Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Mon, 30 Mar 2015 11:50:33 +0800 Subject: [PATCH] MDL-49696 theme_bootstrapbase: Update thirdpartylibs.xml + readme --- theme/bootstrapbase/README.txt | 46 +------------------------- theme/bootstrapbase/readme_moodle.txt | 17 ---------- theme/bootstrapbase/thirdpartylibs.xml | 21 ------------ 3 files changed, 1 insertion(+), 83 deletions(-) diff --git a/theme/bootstrapbase/README.txt b/theme/bootstrapbase/README.txt index c20c74c10c3..dadc4996441 100644 --- a/theme/bootstrapbase/README.txt +++ b/theme/bootstrapbase/README.txt @@ -36,15 +36,9 @@ Explorer 8 (IE8) a javascript library call /javascript/html5shiv.js was added. T JavaScript converts HTML tags and CSS into Tag that are understood by IE7 and IE8. The config.php makes sure these libraries are only loaded for IE7 and IE8. -bootstrapcollapse.js, bootstrapdropdown.js, bootstrapengine.js --------------------------------------------------------------- -These are the 3 out of 12 original YUI ports of the Twitter Bootstrap jQuery libraries by -Jay Shirley. The full list of the ported libraries can be found here: -https://github.com/jshirley/bootstrap/tree/master/js - moodlebootstrap.js ------------------ -This file initiates the bootstrap*.js libraries. +This file initiates the bootstrap library. headercollapse.js ----------------- @@ -76,25 +70,6 @@ https://github.com/aFarkas/html5shiv/blob/master/src/html5shiv.js To update to the latest release of html5shiv download and replace: javascript/html5shiv.js -bootstrapcollapse.js, bootstrapdropdown.js, bootstrapengine.js --------------------------------------------------------------- -This them uses YUI ports of the Twitter bootstrap jQuery based libs. These ported files are available on: - -https://github.com/jshirley/yui3-gallery/blob/master/src/gallery-bootstrap-collapse/js/bootstrap-collapse.js -https://github.com/jshirley/yui3-gallery/blob/master/src/gallery-bootstrap-dropdown/js/bootstrap-dropdown.js -https://github.com/jshirley/yui3-gallery/blob/master/src/gallery-bootstrap-engine/js/bootstrap-engine.js - -The content of these files are slightly modified to make sure all required YUI libraries are loaded. To achieve -that the first and last line of each of these files has been modified. - -The YUI port of the Twitter bootstrap libs are now longer maintained. If you need all of the Bootstrap JavaScript -functionality consider switching to the original jQuery version of these file - -If you do want to update use these file locations: -javascript/bootstrap-collapse.js -javascript/bootstrap-dropdown.js -javascript/bootstrap-engine.js - Licenses & Authors ================== @@ -124,25 +99,6 @@ Author: Sjoerd Visscher URL: http://en.wikipedia.org/wiki/HTML5_Shiv, https://github.com/aFarkas/html5shiv License: MIT/GPL2 Licensed -bootstrapcollapse.js, bootstrapdropdown.js, bootstrapengine.js --------------------------------------------------------------- -Author: Jay Shirley -URL: http://jshirley.github.com/bootstrap/ -License: -Copyright 2012 Twitter, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this work except in compliance with the License. -You may obtain a copy of the License in the LICENSE file, or at: - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - moodlebootstrap.js ------------------ Author: 2013 Bas Brands. www.sonsbeekmedia.nl diff --git a/theme/bootstrapbase/readme_moodle.txt b/theme/bootstrapbase/readme_moodle.txt index 4396ff9b84a..bc95e049d50 100644 --- a/theme/bootstrapbase/readme_moodle.txt +++ b/theme/bootstrapbase/readme_moodle.txt @@ -31,20 +31,3 @@ https://github.com/aFarkas/html5shiv/blob/master/src/html5shiv.js To update to the latest release of html5shiv: * download and replace: javascript/html5shiv.js * update ./thirdpartylibs.xml - -bootstrapcollapse.js, bootstrapdropdown.js, bootstrapengine.js --------------------------------------------------------------- -This theme uses YUI ports of the Twitter bootstrap jQuery based libs. - -Upgrade procedure: -* git clone https://github.com/jshirley/yui-gallery.git -* from that repository copy: -** build/gallery-bootstrap-collapse/gallery-bootstrap-collapse-debug.js to js/gallery-bootstrapcollapse.js -** build/gallery-bootstrap-dropdown/gallery-bootstrap-dropdown-debug.js to js/gallery-bootstrapdropdown.js -** build/gallery-bootstrap-engine/gallery-bootstrap-engine-debug.js to js/gallery-bootstrapengine.js -* apply patches from MDL-43152 to address linting issues -* run shifter on this directory as required -* update ../../../thirdpartylibs.xml - -The YUI port of the Twitter bootstrap libs are now longer maintained. If you need all of the Bootstrap JavaScript -functionality consider switching to the original jQuery version of these file diff --git a/theme/bootstrapbase/thirdpartylibs.xml b/theme/bootstrapbase/thirdpartylibs.xml index 8be3ae0c161..bfbf0e48492 100644 --- a/theme/bootstrapbase/thirdpartylibs.xml +++ b/theme/bootstrapbase/thirdpartylibs.xml @@ -14,25 +14,4 @@ 3.6.2 2.0 - - yui/src/bootstrap/js/bootstrapcollapse.js - Gallery Bootstrap Collapse - BSD - 2012.08.22-20-00 - - - - yui/src/bootstrap/js/bootstrapdropdown.js - Gallery Bootstrap Dropdown - BSD - 2012.08.22-20-00 - - - - yui/src/bootstrap/js/bootstrapengine.js - Gallery Bootstrap Engine - BSD - 2012.08.22-20-00 - -