mirror of https://github.com/twbs/bootstrap.git
				
				
				
			Unbreak short lines
This commit is contained in:
		
							parent
							
								
									9f9e4d04a1
								
							
						
					
					
						commit
						94a5d87e15
					
				| 
						 | 
				
			
			@ -100,8 +100,7 @@ class Alert {
 | 
			
		|||
 | 
			
		||||
    const transitionDuration = getTransitionDurationFromElement(element)
 | 
			
		||||
 | 
			
		||||
    EventHandler
 | 
			
		||||
      .one(element, TRANSITION_END, () => this._destroyElement(element))
 | 
			
		||||
    EventHandler.one(element, TRANSITION_END, () => this._destroyElement(element))
 | 
			
		||||
    emulateTransitionEnd(element, transitionDuration)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -207,8 +207,7 @@ function removeHandler(element, events, typeEvent, handler, delegationSelector)
 | 
			
		|||
function removeNamespacedHandlers(element, events, typeEvent, namespace) {
 | 
			
		||||
  const storeElementEvent = events[typeEvent] || {}
 | 
			
		||||
 | 
			
		||||
  Object.keys(storeElementEvent)
 | 
			
		||||
    .forEach(handlerKey => {
 | 
			
		||||
  Object.keys(storeElementEvent).forEach(handlerKey => {
 | 
			
		||||
    if (handlerKey.indexOf(namespace) > -1) {
 | 
			
		||||
      const event = storeElementEvent[handlerKey]
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -247,15 +246,13 @@ const EventHandler = {
 | 
			
		|||
    }
 | 
			
		||||
 | 
			
		||||
    if (isNamespace) {
 | 
			
		||||
      Object.keys(events)
 | 
			
		||||
        .forEach(elementEvent => {
 | 
			
		||||
      Object.keys(events).forEach(elementEvent => {
 | 
			
		||||
        removeNamespacedHandlers(element, events, elementEvent, originalTypeEvent.slice(1))
 | 
			
		||||
      })
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const storeElementEvent = events[typeEvent] || {}
 | 
			
		||||
    Object.keys(storeElementEvent)
 | 
			
		||||
      .forEach(keyHandlers => {
 | 
			
		||||
    Object.keys(storeElementEvent).forEach(keyHandlers => {
 | 
			
		||||
      const handlerKey = keyHandlers.replace(stripUidRegex, '')
 | 
			
		||||
 | 
			
		||||
      if (!inNamespace || originalTypeEvent.indexOf(handlerKey) > -1) {
 | 
			
		||||
| 
						 | 
				
			
			@ -300,10 +297,9 @@ const EventHandler = {
 | 
			
		|||
      })
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // merge custom informations in our event
 | 
			
		||||
    // merge custom information in our event
 | 
			
		||||
    if (typeof args !== 'undefined') {
 | 
			
		||||
      Object.keys(args)
 | 
			
		||||
        .forEach(key => {
 | 
			
		||||
      Object.keys(args).forEach(key => {
 | 
			
		||||
        Object.defineProperty(evt, key, {
 | 
			
		||||
          get() {
 | 
			
		||||
            return args[key]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -262,11 +262,7 @@ class Dropdown {
 | 
			
		|||
      ...config
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    typeCheckConfig(
 | 
			
		||||
      NAME,
 | 
			
		||||
      config,
 | 
			
		||||
      this.constructor.DefaultType
 | 
			
		||||
    )
 | 
			
		||||
    typeCheckConfig(NAME, config, this.constructor.DefaultType)
 | 
			
		||||
 | 
			
		||||
    return config
 | 
			
		||||
  }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -172,11 +172,7 @@ class Toast {
 | 
			
		|||
      ...typeof config === 'object' && config ? config : {}
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    typeCheckConfig(
 | 
			
		||||
      NAME,
 | 
			
		||||
      config,
 | 
			
		||||
      this.constructor.DefaultType
 | 
			
		||||
    )
 | 
			
		||||
    typeCheckConfig(NAME, config, this.constructor.DefaultType)
 | 
			
		||||
 | 
			
		||||
    return config
 | 
			
		||||
  }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -708,11 +708,7 @@ class Tooltip {
 | 
			
		|||
      config.content = config.content.toString()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    typeCheckConfig(
 | 
			
		||||
      NAME,
 | 
			
		||||
      config,
 | 
			
		||||
      this.constructor.DefaultType
 | 
			
		||||
    )
 | 
			
		||||
    typeCheckConfig(NAME, config, this.constructor.DefaultType)
 | 
			
		||||
 | 
			
		||||
    if (config.sanitize) {
 | 
			
		||||
      config.template = sanitizeHtml(config.template, config.whiteList, config.sanitizeFn)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -110,8 +110,7 @@ const emulateTransitionEnd = (element, duration) => {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
const typeCheckConfig = (componentName, config, configTypes) => {
 | 
			
		||||
  Object.keys(configTypes)
 | 
			
		||||
    .forEach(property => {
 | 
			
		||||
  Object.keys(configTypes).forEach(property => {
 | 
			
		||||
    const expectedTypes = configTypes[property]
 | 
			
		||||
    const value = config[property]
 | 
			
		||||
    const valueType = value && isElement(value) ?
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue