Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B3FFB200C26 for ; Fri, 10 Feb 2017 14:42:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B294B160B5B; Fri, 10 Feb 2017 13:42:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D68FD160B5C for ; Fri, 10 Feb 2017 14:42:57 +0100 (CET) Received: (qmail 95989 invoked by uid 500); 10 Feb 2017 13:42:57 -0000 Mailing-List: contact commits-help@nifi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.apache.org Delivered-To: mailing list commits@nifi.apache.org Received: (qmail 95979 invoked by uid 99); 10 Feb 2017 13:42:56 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Feb 2017 13:42:56 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 3B2AF3A0158 for ; Fri, 10 Feb 2017 13:42:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1782468 [1/3] - in /nifi/site/trunk: assets/js/foundation.js assets/stylesheets/app.css people.html Date: Fri, 10 Feb 2017 13:42:56 -0000 To: commits@nifi.apache.org From: jskora@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170210134256.3B2AF3A0158@svn01-us-west.apache.org> archived-at: Fri, 10 Feb 2017 13:42:58 -0000 Author: jskora Date: Fri Feb 10 13:42:55 2017 New Revision: 1782468 URL: http://svn.apache.org/viewvc?rev=1782468&view=rev Log: Move myself to PMC list. Modified: nifi/site/trunk/assets/js/foundation.js nifi/site/trunk/assets/stylesheets/app.css nifi/site/trunk/people.html Modified: nifi/site/trunk/assets/js/foundation.js URL: http://svn.apache.org/viewvc/nifi/site/trunk/assets/js/foundation.js?rev=1782468&r1=1782467&r2=1782468&view=diff ============================================================================== --- nifi/site/trunk/assets/js/foundation.js (original) +++ nifi/site/trunk/assets/js/foundation.js Fri Feb 10 13:42:55 2017 @@ -1,7 +1,7 @@ /* * Foundation Responsive Library * http://foundation.zurb.com - * Copyright 2014, ZURB + * Copyright 2015, ZURB * Free to use under the MIT license. * http://www.opensource.org/licenses/mit-license.php */ @@ -10,14 +10,12 @@ 'use strict'; var header_helpers = function (class_array) { - var i = class_array.length; var head = $('head'); - - while (i--) { - if (head.has('.' + class_array[i]).length === 0) { - head.append(''); + head.prepend($.map(class_array, function (class_name) { + if (head.has('.' + class_name).length === 0) { + return ''; } - } + })); }; header_helpers([ @@ -290,21 +288,30 @@ return string; } + function MediaQuery(selector) { + this.selector = selector; + this.query = ''; + } + + MediaQuery.prototype.toString = function () { + return this.query || (this.query = S(this.selector).css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, '')); + }; + window.Foundation = { name : 'Foundation', - version : '5.5.2', + version : '5.5.3', media_queries : { - 'small' : S('.foundation-mq-small').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''), - 'small-only' : S('.foundation-mq-small-only').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''), - 'medium' : S('.foundation-mq-medium').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''), - 'medium-only' : S('.foundation-mq-medium-only').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''), - 'large' : S('.foundation-mq-large').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''), - 'large-only' : S('.foundation-mq-large-only').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''), - 'xlarge' : S('.foundation-mq-xlarge').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''), - 'xlarge-only' : S('.foundation-mq-xlarge-only').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, ''), - 'xxlarge' : S('.foundation-mq-xxlarge').css('font-family').replace(/^[\/\\'"]+|(;\s?})+|[\/\\'"]+$/g, '') + 'small' : new MediaQuery('.foundation-mq-small'), + 'small-only' : new MediaQuery('.foundation-mq-small-only'), + 'medium' : new MediaQuery('.foundation-mq-medium'), + 'medium-only' : new MediaQuery('.foundation-mq-medium-only'), + 'large' : new MediaQuery('.foundation-mq-large'), + 'large-only' : new MediaQuery('.foundation-mq-large-only'), + 'xlarge' : new MediaQuery('.foundation-mq-xlarge'), + 'xlarge-only' : new MediaQuery('.foundation-mq-xlarge-only'), + 'xxlarge' : new MediaQuery('.foundation-mq-xxlarge') }, stylesheet : $('').appendTo('head')[0].sheet, @@ -729,7 +736,7 @@ Foundation.libs.topbar = { name : 'topbar', - version : '5.5.2', + version : '5.5.3', settings : { index : 0, @@ -890,17 +897,17 @@ self.toggle(this); }) .on('click.fndtn.topbar contextmenu.fndtn.topbar', '.top-bar .top-bar-section li a[href^="#"],[' + this.attr_name() + '] .top-bar-section li a[href^="#"]', function (e) { - var li = $(this).closest('li'), - topbar = li.closest('[' + self.attr_name() + ']'), - settings = topbar.data(self.attr_name(true) + '-init'); - - if (settings.dropdown_autoclose && settings.is_hover) { - var hoverLi = $(this).closest('.hover'); - hoverLi.removeClass('hover'); - } - if (self.breakpoint() && !li.hasClass('back') && !li.hasClass('has-dropdown')) { - self.toggle(); - } + var li = $(this).closest('li'), + topbar = li.closest('[' + self.attr_name() + ']'), + settings = topbar.data(self.attr_name(true) + '-init'); + + if (settings.dropdown_autoclose && settings.is_hover) { + var hoverLi = $(this).closest('.hover'); + hoverLi.removeClass('hover'); + } + if (self.breakpoint() && !li.hasClass('back') && !li.hasClass('has-dropdown')) { + self.toggle(); + } }) .on('click.fndtn.topbar', '[' + this.attr_name() + '] li.has-dropdown', function (e) { @@ -1184,10 +1191,12 @@ ;;(function ($, window, document, undefined) { 'use strict'; + var openModals = []; + Foundation.libs.reveal = { name : 'reveal', - version : '5.5.2', + version : '5.5.3', locked : false, @@ -1338,7 +1347,7 @@ settings = settings || this.settings; - if (modal.hasClass('open') && target.attr('data-reveal-id') == modal.attr('id')) { + if (modal.hasClass('open') && target !== undefined && target.attr('data-reveal-id') == modal.attr('id')) { return self.close(modal); } @@ -1371,16 +1380,25 @@ }; } - if (typeof ajax_settings === 'undefined' || !ajax_settings.url) { - if (open_modal.length > 0) { - if (settings.multiple_opened) { + var openModal = function() { + if(open_modal.length > 0) { + if(settings.multiple_opened) { self.to_back(open_modal); } else { self.hide(open_modal, settings.css.close); } } - this.show(modal, settings.css.open); + // bl: add the open_modal that isn't already in the background to the openModals array + if(settings.multiple_opened) { + openModals.push(modal); + } + + self.show(modal, settings.css.open); + }; + + if (typeof ajax_settings === 'undefined' || !ajax_settings.url) { + openModal(); } else { var old_success = typeof ajax_settings.success !== 'undefined' ? ajax_settings.success : null; $.extend(ajax_settings, { @@ -1401,14 +1419,7 @@ self.S(modal).foundation('section', 'reflow'); self.S(modal).children().foundation(); - if (open_modal.length > 0) { - if (settings.multiple_opened) { - self.to_back(open_modal); - } else { - self.hide(open_modal, settings.css.close); - } - } - self.show(modal, settings.css.open); + openModal(); } }); @@ -1446,8 +1457,27 @@ } if (settings.multiple_opened) { + var isCurrent = modal.is(':not(.toback)'); self.hide(modal, settings.css.close, settings); - self.to_front($($.makeArray(open_modals).reverse()[1])); + if(isCurrent) { + // remove the last modal since it is now closed + openModals.pop(); + } else { + // if this isn't the current modal, then find it in the array and remove it + openModals = $.grep(openModals, function(elt) { + var isThis = elt[0]===modal[0]; + if(isThis) { + // since it's not currently in the front, put it in the front now that it is hidden + // so that if it's re-opened, it won't be .toback + self.to_front(modal); + } + return !isThis; + }); + } + // finally, show the next modal in the stack, if there is one + if(openModals.length>0) { + self.to_front(openModals[openModals.length - 1]); + } } else { self.hide(open_modals, settings.css.close, settings); } @@ -1520,8 +1550,9 @@ }, settings.animation_speed / 2); } + css.top = $(window).scrollTop() + el.data('css-top') + 'px'; + if (animData.fade) { - css.top = $(window).scrollTop() + el.data('css-top') + 'px'; var end_css = {opacity: 1}; return setTimeout(function () {