diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap-tabdrop/README.md b/src/Umbraco.Web.UI.Client/lib/bootstrap-tabdrop/README.md deleted file mode 100644 index e8d266fb24..0000000000 --- a/src/Umbraco.Web.UI.Client/lib/bootstrap-tabdrop/README.md +++ /dev/null @@ -1,62 +0,0 @@ -bootstrap-tabdrop -================= - -***************************************************************** -NOTE: THIS IS A CUSTOM FIXED VERSION!!!!!!!!!!!!!!!!!!!!!! -- THE ORIGINAL HAS A MEMORY LEAK, SO WE'VE HAD TO EMBED THIS - INTO THE CORE WITH THE FIX - ---- UMBRACO CORE TEAM -***************************************************************** - -A dropdown tab tool for @twitter bootstrap forked from Stefan Petre's (of eyecon.ro), - -The dropdown tab appears when your tabs do not all fit in the same row. - -Original site and examples: http://www.eyecon.ro/bootstrap-tabdrop/ - -Added functionality: Displays the text of an active tab selected from the dropdown list instead of the text option on the dropdown tab. - - -## Requirements - -* [Bootstrap](http://twitter.github.com/bootstrap/) 2.0.4+ -* [jQuery](http://jquery.com/) 1.7.1+ - -## Example - -No additional HTML needed - the script adds it when the dropdown tab is needed. - -Using bootstrap-tabdrop.js -Call the tab drop via javascript on .nav-tabs and .nav-pills: -```js -$('.nav-pills, .nav-tabs').tabdrop() -``` - -### Options - -#### text -Type: string -Default: icon -```html - -``` -To change the default value, call -```javascript -.tabdrop({text: "your text here"}); -``` -when initalizing the tabdrop. The displayed value will change when a tab is selected from the dropdown list. - -### Methods - -```js -.tabdrop(options) -``` - -Initializes an tab drop. - -```js -.tabdrop('layout') -``` - -Checks if the tabs fit in one single row. diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap-tabdrop/bootstrap-tabdrop.js b/src/Umbraco.Web.UI.Client/lib/bootstrap-tabdrop/bootstrap-tabdrop.js deleted file mode 100644 index ede04bfc6b..0000000000 --- a/src/Umbraco.Web.UI.Client/lib/bootstrap-tabdrop/bootstrap-tabdrop.js +++ /dev/null @@ -1,132 +0,0 @@ -/* ========================================================= - * bootstrap-tabdrop.js - * http://www.eyecon.ro/bootstrap-tabdrop - * ========================================================= - * Copyright 2012 Stefan Petre - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License 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. - * ========================================================= */ - -/***************************************************************** - * NOTE: THIS IS A CUSTOM FIXED VERSION!!!!!!!!!!!!!!!!!!!!!! - * - THE ORIGINAL HAS A MEMORY LEAK, SO WE'VE HAD TO EMBED THIS - * INTO THE CORE WITH THE FIX - * - * --- UMBRACO CORE TEAM - *****************************************************************/ - -!function( $ ) { - - var WinReszier = (function(){ - var registered = []; - var inited = false; - var timer; - var resize = function(ev) { - clearTimeout(timer); - timer = setTimeout(notify, 100); - }; - var notify = function() { - for(var i=0, cnt=registered.length; i -1) { - registered.splice(index, 1); - } - } - }; - }()); - - var TabDrop = function(element, options) { - this.element = $(element); - this.dropdown = $('').prependTo(this.element); - if (this.element.parent().is('.tabs-below')) { - this.dropdown.addClass('dropup'); - } - this.resizeCallback = $.proxy(this.layout, this); - WinReszier.register(this.resizeCallback); - this.layout(); - }; - - TabDrop.prototype = { - constructor: TabDrop, - - layout: function() { - var collection = []; - this.dropdown.removeClass('hide'); - this.element - .append(this.dropdown.find('li')) - .find('>li') - .not('.tabdrop') - .each(function(){ - if(this.offsetTop > 0) { - collection.push(this); - } - }); - if (collection.length > 0) { - collection = $(collection); - this.dropdown - .find('ul') - .empty() - .append(collection); - if (this.dropdown.find('.active').length == 1) { - this.dropdown.addClass('active'); - } else { - this.dropdown.removeClass('active'); - } - } else { - this.dropdown.addClass('hide'); - } - }, - - destroy: function() { - this.dropdown.html(); - WinReszier.unregister(this.resizeCallback); - } - }; - - $.fn.tabdrop = function ( option ) { - return this.each(function () { - var $this = $(this), - data = $this.data('tabdrop'), - options = typeof option === 'object' && option; - if (!data) { - $this.data('tabdrop', (data = new TabDrop(this, $.extend({}, - $.fn.tabdrop.defaults,options)))); - } - if (typeof option == 'string') { - data[option](); - } - }); - }; - - $.fn.tabdrop.defaults = { - text: '' - }; - - $.fn.tabdrop.Constructor = TabDrop; - -}(window.jQuery); \ No newline at end of file diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js index 7f64e2689f..1a154fe1d5 100644 --- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js +++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js @@ -15,16 +15,15 @@ 'lib/angular-touch/angular-touch.js', 'lib/angular-sanitize/angular-sanitize.js', 'lib/angular-animate/angular-animate.js', - 'lib/angular-messages/angular-messages.js', + 'lib/angular-messages/angular-messages.js', 'lib/angular-ui-sortable/sortable.js', 'lib/angular-dynamic-locale/tmhDynamicLocale.min.js', 'lib/ng-file-upload/ng-file-upload.min.js', - 'lib/angular-local-storage/angular-local-storage.min.js', + 'lib/angular-local-storage/angular-local-storage.min.js', 'lib/bootstrap/js/bootstrap.2.3.2.min.js', - 'lib/bootstrap-tabdrop/bootstrap-tabdrop.js', 'lib/umbraco/Extensions.js', 'lib/umbraco/NamespaceManager.js',