| Index: trunk/extensions/WebFonts/resources/ext.webfonts.js |
| — | — | @@ -1,4 +1,4 @@ |
| 2 | | -( function( $ ) { |
| | 2 | +( function( $, mw, undefined ) { |
| 3 | 3 | |
| 4 | 4 | function fontID( font ) { |
| 5 | 5 | if ( typeof font !== 'string' ) { |
| — | — | @@ -19,28 +19,30 @@ |
| 20 | 20 | return; |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | | - if ( !( font in mw.webfonts.config.fonts ) ) { |
| | 23 | + if ( mw.webfonts.config.fonts[font] === undefined ) { |
| 24 | 24 | mw.log( 'Requested unknown font', font ); |
| 25 | 25 | return; |
| 26 | 26 | } |
| 27 | | - var config = mw.webfonts.config.fonts[font]; |
| | 27 | + var config = mw.webfonts.config.fonts[font], |
| | 28 | + $body = $( 'body' ); |
| 28 | 29 | |
| 29 | 30 | // Load the style sheet for the font |
| 30 | 31 | mw.webfonts.addFont( font ); |
| 31 | | - |
| | 32 | + |
| 32 | 33 | // Save the current font and its size. Used for reset. |
| 33 | 34 | if ( !mw.webfonts.oldconfig ) { |
| 34 | | - var $body = $( 'body' ); |
| | 35 | + |
| 35 | 36 | mw.webfonts.oldconfig = { |
| 36 | 37 | fontFamily: $body.css( 'font-family' ), |
| 37 | 38 | fontSize: $body.css( 'font-size' ) |
| 38 | 39 | }; |
| 39 | 40 | } |
| 40 | 41 | |
| 41 | | - // Set the font, fallback fonts.Need to change the fonts of Input Select and Textarea explicitly. |
| | 42 | + // Set the font, fallback fonts. |
| | 43 | + // Need to change the fonts of Input Select and Textarea explicitly. |
| 42 | 44 | $( 'body, input, select, textarea' ).css( 'font-family', '"' + font + '", Helvetica, Arial, sans-serif' ); |
| 43 | 45 | |
| 44 | | - if ( 'normalization' in config ) { |
| | 46 | + if ( config.normalization !== undefined ) { |
| 45 | 47 | $( document ).ready( function() { |
| 46 | 48 | mw.webfonts.normalize( config.normalization ); |
| 47 | 49 | } ); |
| — | — | @@ -79,7 +81,7 @@ |
| 80 | 82 | var searchPattern = new RegExp( search, 'g' ); |
| 81 | 83 | return $( '*' ).each( function() { |
| 82 | 84 | var node = this.firstChild, |
| 83 | | - val, newVal; |
| | 85 | + val, newVal; |
| 84 | 86 | if ( node ) { |
| 85 | 87 | do { |
| 86 | 88 | if ( node.nodeType === 3 ) { |
| — | — | @@ -101,50 +103,45 @@ |
| 102 | 104 | * @param fontFamily The font-family name |
| 103 | 105 | */ |
| 104 | 106 | loadCSS: function( fontFamily ) { |
| 105 | | - var fontconfig = mw.webfonts.config.fonts[fontFamily]; |
| 106 | | - var base = mw.config.get( 'wgExtensionAssetsPath' ) + '/WebFonts/fonts/'; |
| 107 | | - var fontFormats = []; |
| 108 | | - var version = "0.0"; |
| 109 | | - if ( 'version' in fontconfig ) { |
| 110 | | - version = fontconfig.version; |
| 111 | | - } |
| 112 | | - var versionSuffix = "?version=" + version + '&20111213'; |
| 113 | | - var styleString = |
| 114 | | - "<style type='text/css'>\n@font-face {\n" |
| 115 | | - + "\tfont-family: '"+fontFamily+"';\n"; |
| | 107 | + var fontconfig = mw.webfonts.config.fonts[fontFamily], |
| | 108 | + base = mw.config.get( 'wgExtensionAssetsPath' ) + '/WebFonts/fonts/', |
| | 109 | + fontFormats = [], |
| | 110 | + version = fontconfig.version || "0.0", |
| | 111 | + versionSuffix = "?version=" + version + '&20111213', |
| | 112 | + styleString = "@font-face { font-family: '"+fontFamily+"';\n", |
| | 113 | + ua = navigator.userAgent; |
| 116 | 114 | |
| 117 | | - if ( 'eot' in fontconfig ) { |
| 118 | | - styleString += "\tsrc: url('" + base+ fontconfig.eot + versionSuffix+ "');\n"; |
| | 115 | + if ( fontconfig.eot !== undefined ) { |
| | 116 | + styleString += "\tsrc: url('" + base + fontconfig.eot + versionSuffix + "');\n"; |
| 119 | 117 | } |
| 120 | 118 | |
| 121 | 119 | styleString += "\tsrc: "; |
| | 120 | + |
| 122 | 121 | // If the font is present locally, use it. |
| 123 | | - var ua = navigator.userAgent; |
| 124 | | - if( ua.match( /Android 2\.3/ ) == null ) { |
| 125 | | - // Android 2.3.x does not respect local() syntax. |
| | 122 | + if( ua.match( /Android 2\.3/ ) === null ) { |
| | 123 | + // Android 2.3.x does not respect local() syntax. |
| 126 | 124 | // http://code.google.com/p/android/issues/detail?id=10609 |
| 127 | | - styleString += "local('"+fontFamily+"'),"; |
| | 125 | + styleString += "local('" + fontFamily + "'),"; |
| 128 | 126 | } |
| 129 | | - |
| 130 | | - if ( 'woff' in fontconfig ) { |
| | 127 | + |
| | 128 | + if ( fontconfig.woff !== undefined ) { |
| 131 | 129 | fontFormats.push( "\t\turl('" + base + fontconfig.woff + versionSuffix + "') format('woff')" ); |
| 132 | 130 | } |
| 133 | 131 | |
| 134 | | - if ( 'svg' in fontconfig ) { |
| | 132 | + if ( fontconfig.svg !== undefined ) { |
| 135 | 133 | fontFormats.push( "\t\turl('" + base + fontconfig.svg + versionSuffix + "#" + fontFamily + "') format('svg')" ); |
| 136 | 134 | } |
| 137 | 135 | |
| 138 | | - if ( 'ttf' in fontconfig ) { |
| | 136 | + if ( fontconfig.ttf !== undefined ) { |
| 139 | 137 | fontFormats.push( "\t\turl('" + base + fontconfig.ttf + versionSuffix + "') format('truetype')" ); |
| 140 | 138 | } |
| 141 | | - |
| | 139 | + |
| 142 | 140 | styleString += fontFormats.join() + ";\n"; |
| 143 | | - styleString += "\tfont-weight: normal;\n}\n</style>\n"; |
| | 141 | + styleString += "\tfont-weight: normal;}"; |
| 144 | 142 | |
| 145 | | - //inject the css to the head of the page. |
| 146 | | - $( styleString ).appendTo( 'head' ); |
| | 143 | + mw.util.addCSS( styleString ); |
| 147 | 144 | }, |
| 148 | | - |
| | 145 | + |
| 149 | 146 | /** |
| 150 | 147 | * Add a font to the page. |
| 151 | 148 | * This method ensures that css are not duplicated and |
| — | — | @@ -155,13 +152,13 @@ |
| 156 | 153 | // Avoid duplicate loading |
| 157 | 154 | if ( $.inArray( fontFamilyName, mw.webfonts.fonts ) === -1 ) { |
| 158 | 155 | // Check whether the requested font is available. |
| 159 | | - if ( fontFamilyName in mw.webfonts.config.fonts ) { |
| | 156 | + if ( mw.webfonts.config.fonts[fontFamilyName] !== undefined ) { |
| 160 | 157 | mw.webfonts.loadCSS( fontFamilyName ); |
| 161 | 158 | mw.webfonts.fonts.push( fontFamilyName ); |
| 162 | 159 | } |
| 163 | 160 | } |
| 164 | 161 | }, |
| 165 | | - |
| | 162 | + |
| 166 | 163 | /** |
| 167 | 164 | * Setup the font selection menu. |
| 168 | 165 | * It also apply the font from cookie, if any. |
| — | — | @@ -178,52 +175,53 @@ |
| 179 | 176 | return; |
| 180 | 177 | } |
| 181 | 178 | } |
| 182 | | - |
| 183 | | - var config = []; |
| 184 | | - var languages = mw.webfonts.config.languages; |
| 185 | | - var requested = [mw.config.get( 'wgUserVariant' ), mw.config.get( 'wgContentLanguage' ), mw.config.get( 'wgUserLanguage' )]; |
| 186 | 179 | |
| 187 | | - for ( var i = 0; i < requested.length; i++ ) { |
| 188 | | - if ( requested[i] in languages ) { |
| 189 | | - var fonts = languages[requested[i]]; |
| 190 | | - for ( var j = 0; j < fonts.length; j++ ) { |
| 191 | | - if ( $.inArray( fonts[j], config ) === -1 ) { |
| 192 | | - config.push( fonts[j] ); |
| | 180 | + var fonts = [], |
| | 181 | + languages = mw.webfonts.config.languages, |
| | 182 | + requested = [mw.config.get( 'wgUserVariant' ), mw.config.get( 'wgContentLanguage' ), mw.config.get( 'wgUserLanguage' )], |
| | 183 | + i, j; |
| | 184 | + |
| | 185 | + for ( i = 0; i < requested.length; i++ ) { |
| | 186 | + if ( languages[requested[i]] !== undefined ) { |
| | 187 | + fonts = languages[requested[i]]; |
| | 188 | + for ( j = 0; j < fonts.length; j++ ) { |
| | 189 | + if ( $.inArray( fonts[j], fonts ) === -1 ) { |
| | 190 | + fonts.push( fonts[j] ); |
| 193 | 191 | } |
| 194 | 192 | } |
| 195 | 193 | } |
| 196 | 194 | } |
| 197 | 195 | |
| 198 | 196 | // Build font dropdown |
| 199 | | - mw.webfonts.buildMenu( config ); |
| | 197 | + mw.webfonts.buildMenu( fonts ); |
| 200 | 198 | // See if there is a font in cookie if not first font is default font. |
| 201 | | - var cookieFont = $.cookie( 'webfonts-font' ); |
| 202 | | - var selectedFont = null; |
| | 199 | + var cookieFont = $.cookie( 'webfonts-font' ), |
| | 200 | + selectedFont = null; |
| 203 | 201 | // check whether this font is for the current userlang/contentlang |
| 204 | | - if ( $.inArray( cookieFont, config ) !== -1 || cookieFont === 'none' ) { |
| | 202 | + if ( $.inArray( cookieFont, fonts ) !== -1 || cookieFont === 'none' ) { |
| 205 | 203 | selectedFont = cookieFont; |
| 206 | 204 | } |
| 207 | | - else{ |
| 208 | | - // We cannot use cookie font since it is not one of the fonts suitable |
| | 205 | + else { |
| | 206 | + // We cannot use cookie font since it is not one of the fonts suitable |
| 209 | 207 | // for current language. |
| 210 | | - selectedFont = config[0]; |
| | 208 | + selectedFont = fonts[0]; |
| 211 | 209 | } |
| 212 | 210 | if ( selectedFont ) { |
| 213 | 211 | mw.webfonts.set( selectedFont ); |
| 214 | 212 | // Mark it as checked |
| 215 | 213 | $( '#'+fontID( selectedFont ) ).prop( 'checked', true ); |
| 216 | 214 | } |
| 217 | | - |
| | 215 | + |
| 218 | 216 | mw.webfonts.loadFontsForFontFamilyStyle(); |
| 219 | 217 | mw.webfonts.loadFontsForLangAttr(); |
| 220 | 218 | |
| 221 | 219 | if ( $( '.webfonts-lang-attr' ).length && !$( '#webfonts-fontsmenu' ).length ) { |
| 222 | | - // We need to show the reset option even if there is no font to show |
| | 220 | + // We need to show the reset option even if there is no font to show |
| 223 | 221 | // for the language, if there is lang attr based font embedding. |
| 224 | | - mw.webfonts.buildMenu( config ); |
| | 222 | + mw.webfonts.buildMenu( fonts ); |
| 225 | 223 | } |
| 226 | 224 | }, |
| 227 | | - |
| | 225 | + |
| 228 | 226 | /** |
| 229 | 227 | * Scan the page for tags with lang attr and load the default font |
| 230 | 228 | * for that language if available. |
| — | — | @@ -232,32 +230,31 @@ |
| 233 | 231 | var languages = mw.webfonts.config.languages; |
| 234 | 232 | var requested = [mw.config.get( 'wgUserVariant' ), mw.config.get( 'wgContentLanguage' ), mw.config.get( 'wgUserLanguage' )]; |
| 235 | 233 | var fontFamily = false; |
| 236 | | - // If there are tags with lang attribute, |
| 237 | | - $( 'body' ).find( '*[lang]' ).each( function( index ) { |
| | 234 | + // If there are tags with lang attribute, |
| | 235 | + $( 'body' ).find( '*[lang]' ).each( function( i, el) { |
| 238 | 236 | // If the lang attribute value is same as one of |
| 239 | 237 | // contentLang,useLang, variant, no need to do this. |
| 240 | | - if( $.inArray( this.lang , requested ) === -1 ) { |
| | 238 | + if( $.inArray( el.lang , requested ) === -1 ) { |
| 241 | 239 | // check the availability of font, add a font-family style if it does not have any |
| 242 | | - if( languages[this.lang] && ( !this.style.fontFamily || this.style.fontFamily === 'none' ) ) { |
| 243 | | - fontFamily = languages[this.lang][0]; |
| | 240 | + if( languages[el.lang] && ( !el.style.fontFamily || el.style.fontFamily === 'none' ) ) { |
| | 241 | + fontFamily = languages[el.lang][0]; |
| 244 | 242 | mw.webfonts.addFont( fontFamily ); |
| 245 | | - $(this).css( 'font-family', fontFamily ).addClass( 'webfonts-lang-attr' ); |
| | 243 | + $(el).css( 'font-family', fontFamily ).addClass( 'webfonts-lang-attr' ); |
| 246 | 244 | } |
| 247 | 245 | } |
| 248 | 246 | }); |
| 249 | 247 | }, |
| 250 | | - |
| | 248 | + |
| 251 | 249 | /** |
| 252 | 250 | * Scan the page for tags with font-family style declarations |
| 253 | 251 | * If that font is available, embed it. |
| 254 | 252 | */ |
| 255 | 253 | loadFontsForFontFamilyStyle: function() { |
| 256 | | - var languages = mw.webfonts.config.languages; |
| 257 | 254 | // If there are tags with font-family style definition, get a list of fonts to be loaded |
| 258 | | - $( 'body' ).find( '*[style]' ).each( function( index ) { |
| 259 | | - if( this.style.fontFamily ) { |
| 260 | | - var fontFamilyItems = this.style.fontFamily.split( ',' ); |
| 261 | | - $.each( fontFamilyItems, function( index, fontFamily ) { |
| | 255 | + $( 'body' ).find( '*[style]' ).each( function( i, el ) { |
| | 256 | + if( el.style.fontFamily ) { |
| | 257 | + var fontFamilyItems = el.style.fontFamily.split( ',' ); |
| | 258 | + $.each( fontFamilyItems, function( i, fontFamily ) { |
| 262 | 259 | // Remove the ' characters if any. |
| 263 | 260 | fontFamily = fontFamily.replace( /'/g, '' ); |
| 264 | 261 | mw.webfonts.addFont( fontFamily ); |
| — | — | @@ -266,79 +263,81 @@ |
| 267 | 264 | }); |
| 268 | 265 | |
| 269 | 266 | }, |
| 270 | | - |
| | 267 | + |
| 271 | 268 | /** |
| 272 | 269 | * Prepare the div containing menu items. |
| 273 | | - * @param config The webfont configuration. |
| | 270 | + * @param fonts {Array} List of fonts to be provided as a menu option. |
| 274 | 271 | */ |
| 275 | | - buildMenuItems: function ( config ){ |
| 276 | | - var haveSchemes = false; |
| 277 | | - // Build font dropdown |
| 278 | | - var $fontsMenu = $( '<ul>' ).attr( 'id', 'webfonts-fontsmenu' ); |
| 279 | | - $fontsMenu.delegate( 'input:radio', 'click', function( ) { |
| 280 | | - mw.webfonts.set( $(this).val() ); |
| 281 | | - } ); |
| 282 | | - for ( var scheme in config ) { |
| 283 | | - if ( !Object.prototype.hasOwnProperty.call( config, scheme ) ) { |
| 284 | | - continue; |
| 285 | | - } |
| | 272 | + buildMenuItems: function ( fonts ){ |
| | 273 | + var haveSchemes = false, |
| | 274 | + $fontsMenu = $( '<ul>' ) |
| | 275 | + .attr( 'id', 'webfonts-fontsmenu' ) |
| | 276 | + .delegate( 'input:radio', 'click', function() { |
| | 277 | + mw.webfonts.set( $(this).val() ); |
| | 278 | + } ), |
| | 279 | + len = fonts.length, |
| | 280 | + i, font, $link, $label, $item; |
| 286 | 281 | |
| 287 | | - var $fontLink = $( '<input type="radio" name="font" />' ) |
| 288 | | - .attr( 'id', fontID( config[scheme] ) ) |
| 289 | | - .val( config[scheme] ); |
| | 282 | + for ( i = 0; i < len; i++ ) { |
| | 283 | + font = fonts[i]; |
| 290 | 284 | |
| 291 | | - var $fontLabel = $( '<label>' ) |
| 292 | | - .attr( 'for',fontID(config[scheme] ) ) |
| 293 | | - .append( $fontLink ) |
| 294 | | - .append( config[scheme] ); |
| | 285 | + $link = $( '<input type="radio" name="font" />' ) |
| | 286 | + .attr( 'id', fontID( font ) ) |
| | 287 | + .val( font ); |
| 295 | 288 | |
| 296 | | - var $fontMenuItem = $( '<li>' ) |
| 297 | | - .val( config[scheme] ) |
| 298 | | - .append( $fontLabel ); |
| | 289 | + $label = $( '<label>' ) |
| | 290 | + .attr( 'for',fontID( font ) ) |
| | 291 | + .append( $link ) |
| | 292 | + .append( font ); |
| 299 | 293 | |
| | 294 | + $item = $( '<li>' ) |
| | 295 | + .val( font ) |
| | 296 | + .append( $label ); |
| | 297 | + |
| 300 | 298 | haveSchemes = true; |
| 301 | 299 | |
| 302 | | - $fontsMenu.append( $fontMenuItem ); |
| | 300 | + $fontsMenu.append( $item ); |
| 303 | 301 | |
| 304 | 302 | } |
| 305 | 303 | |
| 306 | | - if ( !haveSchemes && !$( '.webfonts-lang-attr' ).length ) { |
| | 304 | + $link = $label = $item = undefined; |
| | 305 | + |
| | 306 | + if ( !haveSchemes && !$( '.webfonts-lang-attr' ).length ) { |
| 307 | 307 | // No schemes available, and no tags with lang attr |
| 308 | 308 | // with fonts loaded. Don't show the menu. |
| 309 | 309 | return null; |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | | - var $resetLink = $( '<input type="radio" name="font" />' ) |
| | 312 | + $link = $( '<input type="radio" name="font" />' ) |
| 313 | 313 | .attr( 'value', 'webfont-none' ) |
| 314 | 314 | .attr( 'id', 'webfont-none' ) |
| 315 | | - .click( function( e ) { |
| | 315 | + .click( function() { |
| 316 | 316 | mw.webfonts.set( 'none' ); |
| 317 | 317 | }); |
| 318 | 318 | |
| 319 | | - var $resetLabel = $( '<label>' ) |
| | 319 | + $label = $( '<label>' ) |
| 320 | 320 | .attr( 'for', 'webfont-none' ) |
| 321 | | - .append( $resetLink ) |
| | 321 | + .append( $link ) |
| 322 | 322 | .append( mw.message( 'webfonts-reset' ).escaped() ); |
| 323 | 323 | |
| 324 | | - var $resetLinkItem = $( '<li>' ) |
| | 324 | + $item = $( '<li>' ) |
| 325 | 325 | .val( 'none' ) |
| 326 | | - .append( $resetLabel ); |
| | 326 | + .append( $label ); |
| 327 | 327 | |
| 328 | | - $fontsMenu.append( $resetLinkItem ); |
| | 328 | + $fontsMenu.append( $item ); |
| 329 | 329 | |
| 330 | | - var $menuDiv = $( '<div>' ) |
| | 330 | + return $( '<div>' ) |
| 331 | 331 | .attr( 'id', 'webfonts-fonts' ) |
| 332 | 332 | .addClass( 'menu' ) |
| 333 | | - .append( $fontsMenu ) |
| 334 | | - .append(); |
| 335 | | - return $menuDiv; |
| | 333 | + .append( $fontsMenu ); |
| 336 | 334 | }, |
| | 335 | + |
| 337 | 336 | /** |
| 338 | 337 | * Prepare the menu for the webfonts. |
| 339 | | - * @param config The webfont configuration. |
| | 338 | + * @param fonts {Array} List of fonts to be provided as a menu option. |
| 340 | 339 | */ |
| 341 | | - buildMenu: function(config) { |
| 342 | | - var $menuItemsDiv = mw.webfonts.buildMenuItems( config ); |
| | 340 | + buildMenu: function( fonts ) { |
| | 341 | + var $menuItemsDiv = mw.webfonts.buildMenuItems( fonts ); |
| 343 | 342 | if( $menuItemsDiv === null ) { |
| 344 | 343 | return; |
| 345 | 344 | } |
| — | — | @@ -363,7 +362,7 @@ |
| 364 | 363 | $( 'body' ).prepend( $menu ); |
| 365 | 364 | $li.click( function( event ) { |
| 366 | 365 | var menuSide, menuOffset, distanceToEdge; |
| 367 | | - |
| | 366 | + |
| 368 | 367 | if ( rtlEnv ) { |
| 369 | 368 | distanceToEdge = $li.outerWidth() + $li.offset().left; |
| 370 | 369 | if ( $menuItemsDiv.outerWidth() > distanceToEdge ) { |
| — | — | @@ -394,22 +393,25 @@ |
| 395 | 394 | event.stopPropagation(); |
| 396 | 395 | } |
| 397 | 396 | } ); |
| | 397 | + |
| 398 | 398 | $( 'html' ).click( function() { |
| 399 | 399 | $menu.removeClass( 'open' ); |
| 400 | 400 | } ); |
| | 401 | + |
| 401 | 402 | $menu.click( function( event ) { |
| 402 | 403 | event.stopPropagation(); |
| 403 | 404 | } ); |
| | 405 | + |
| 404 | 406 | // Workaround for IE bug - ActiveX components like input fields coming on top of everything. |
| 405 | 407 | // @todo Is there a better solution other than hiding it on hover? |
| 406 | | - if ( $.browser.msie ) { |
| | 408 | + if ( $.browser.msie ) { |
| 407 | 409 | $( '#webfonts-menu' ).hover( function() { |
| 408 | 410 | $( '#searchform' ).css({ visibility: 'hidden' } ); |
| 409 | | - }, function( ) { |
| | 411 | + }, function() { |
| 410 | 412 | $( '#searchform' ).css( { visibility: 'visible' } ); |
| 411 | 413 | } ); |
| 412 | 414 | } |
| 413 | 415 | } |
| 414 | 416 | }; |
| 415 | 417 | |
| 416 | | -} ) ( jQuery ); |
| | 418 | +})( jQuery, mediaWiki ); |
| \ No newline at end of file |
| Index: trunk/extensions/WebFonts/resources/ext.webfonts.fontlist.js |
| — | — | @@ -41,7 +41,7 @@ |
| 42 | 42 | woff: "Deva/SamyakDevanagari.woff", |
| 43 | 43 | version: "1.0" |
| 44 | 44 | }, |
| 45 | | - |
| | 45 | + |
| 46 | 46 | "Madan": { |
| 47 | 47 | eot: "Deva/madan.eot", |
| 48 | 48 | ttf: "Deva/madan.ttf", |
| — | — | @@ -89,7 +89,7 @@ |
| 90 | 90 | eot: "Khmr/KhmerOS.eot", |
| 91 | 91 | ttf: "Khmr/KhmerOS.ttf", |
| 92 | 92 | woff: "Khmr/KhmerOS.woff", |
| 93 | | - svg: "Khmr/KhmerOS.svg", |
| | 93 | + svg: "Khmr/KhmerOS.svg", |
| 94 | 94 | version: "1.10" |
| 95 | 95 | }, |
| 96 | 96 | |
| — | — | @@ -97,7 +97,7 @@ |
| 98 | 98 | eot: "Khmr/KhmerOSbattambang.eot", |
| 99 | 99 | ttf: "Khmr/KhmerOSbattambang.ttf", |
| 100 | 100 | woff: "Khmr/KhmerOSbattambang.woff", |
| 101 | | - svg: "Khmr/KhmerOSbattambang.svg", |
| | 101 | + svg: "Khmr/KhmerOSbattambang.svg", |
| 102 | 102 | version: "1.10" |
| 103 | 103 | }, |
| 104 | 104 | |
| — | — | @@ -105,7 +105,7 @@ |
| 106 | 106 | eot: "Khmr/KhmerOSbokor.eot", |
| 107 | 107 | ttf: "Khmr/KhmerOSbokor.ttf", |
| 108 | 108 | woff: "Khmr/KhmerOSbokor.woff", |
| 109 | | - svg: "Khmr/KhmerOSbokor.svg", |
| | 109 | + svg: "Khmr/KhmerOSbokor.svg", |
| 110 | 110 | version: "1.10" |
| 111 | 111 | }, |
| 112 | 112 | |
| — | — | @@ -113,7 +113,7 @@ |
| 114 | 114 | eot: "Khmr/KhmerOSfreehand.eot", |
| 115 | 115 | ttf: "Khmr/KhmerOSfreehand.ttf", |
| 116 | 116 | woff: "Khmr/KhmerOSfreehand.woff", |
| 117 | | - svg: "Khmr/KhmerOSfreehand.svg", |
| | 117 | + svg: "Khmr/KhmerOSfreehand.svg", |
| 118 | 118 | version: "1.10" |
| 119 | 119 | }, |
| 120 | 120 | |
| — | — | @@ -121,7 +121,7 @@ |
| 122 | 122 | eot: "Khmr/KhmerOSfasthand.eot", |
| 123 | 123 | ttf: "Khmr/KhmerOSfasthand.ttf", |
| 124 | 124 | woff: "Khmr/KhmerOSfasthand.woff", |
| 125 | | - svg: "Khmr/KhmerOSfasthand.svg", |
| | 125 | + svg: "Khmr/KhmerOSfasthand.svg", |
| 126 | 126 | version: "1.10" |
| 127 | 127 | }, |
| 128 | 128 | |
| — | — | @@ -129,7 +129,7 @@ |
| 130 | 130 | eot: "Khmr/KhmerOSmuol.eot", |
| 131 | 131 | ttf: "Khmr/KhmerOSmuol.ttf", |
| 132 | 132 | woff: "Khmr/KhmerOSmuol.woff", |
| 133 | | - svg: "Khmr/KhmerOSmuol.svg", |
| | 133 | + svg: "Khmr/KhmerOSmuol.svg", |
| 134 | 134 | version: "1.10" |
| 135 | 135 | }, |
| 136 | 136 | |
| — | — | @@ -137,7 +137,7 @@ |
| 138 | 138 | eot: "Khmr/KhmerOSmuollight.eot", |
| 139 | 139 | ttf: "Khmr/KhmerOSmuollight.ttf", |
| 140 | 140 | woff: "Khmr/KhmerOSmuollight.woff", |
| 141 | | - svg: "Khmr/KhmerOSmuollight.svg", |
| | 141 | + svg: "Khmr/KhmerOSmuollight.svg", |
| 142 | 142 | version: "1.10" |
| 143 | 143 | }, |
| 144 | 144 | |
| — | — | @@ -145,7 +145,7 @@ |
| 146 | 146 | eot: "Khmr/KhmerOSmuolpali.eot", |
| 147 | 147 | ttf: "Khmr/KhmerOSmuolpali.ttf", |
| 148 | 148 | woff: "Khmr/KhmerOSmuolpali.woff", |
| 149 | | - svg: "Khmr/KhmerOSmuolpali.svg", |
| | 149 | + svg: "Khmr/KhmerOSmuolpali.svg", |
| 150 | 150 | version: "1.10" |
| 151 | 151 | }, |
| 152 | 152 | |
| — | — | @@ -153,7 +153,7 @@ |
| 154 | 154 | eot: "Khmr/KhmerOSsiemreap.eot", |
| 155 | 155 | ttf: "Khmr/KhmerOSsiemreap.ttf", |
| 156 | 156 | woff: "Khmr/KhmerOSsiemreap.woff", |
| 157 | | - svg: "Khmr/KhmerOSsiemreap.svg", |
| | 157 | + svg: "Khmr/KhmerOSsiemreap.svg", |
| 158 | 158 | version: "1.10" |
| 159 | 159 | }, |
| 160 | 160 | |
| — | — | @@ -241,7 +241,7 @@ |
| 242 | 242 | eot: "Mymr/MasterpieceUniSans.eot", |
| 243 | 243 | ttf: "Mymr/MasterpieceUniSans.ttf", |
| 244 | 244 | woff: "Mymr/MasterpieceUniSans.woff", |
| 245 | | - svg: "Mymr/MasterpieceUniSans.svg", |
| | 245 | + svg: "Mymr/MasterpieceUniSans.svg", |
| 246 | 246 | version: "0.5" |
| 247 | 247 | }, |
| 248 | 248 | |
| — | — | @@ -249,7 +249,7 @@ |
| 250 | 250 | eot: "Mymr/Myanmar3.eot", |
| 251 | 251 | ttf: "Mymr/Myanmar3.ttf", |
| 252 | 252 | woff: "Mymr/Myanmar3.woff", |
| 253 | | - svg: "Mymr/Myanmar3.svg", |
| | 253 | + svg: "Mymr/Myanmar3.svg", |
| 254 | 254 | version: "3.0" |
| 255 | 255 | }, |
| 256 | 256 | |
| — | — | @@ -257,7 +257,7 @@ |
| 258 | 258 | eot: "Mymr/Padauk-Regular.eot", |
| 259 | 259 | ttf: "Mymr/Padauk-Regular.ttf", |
| 260 | 260 | woff: "Mymr/Padauk-Regular.woff", |
| 261 | | - svg: "Mymr/Padauk-Regular.svg", |
| | 261 | + svg: "Mymr/Padauk-Regular.svg", |
| 262 | 262 | version: "2.8" |
| 263 | 263 | }, |
| 264 | 264 | |
| — | — | @@ -265,7 +265,7 @@ |
| 266 | 266 | eot: "Mymr/Yunghkio.eot", |
| 267 | 267 | ttf: "Mymr/Yunghkio.ttf", |
| 268 | 268 | woff: "Mymr/Yunghkio.woff", |
| 269 | | - svg: "Mymr/Yunghkio.svg", |
| | 269 | + svg: "Mymr/Yunghkio.svg", |
| 270 | 270 | version: "1.0" |
| 271 | 271 | }, |
| 272 | 272 | |
| — | — | @@ -297,14 +297,14 @@ |
| 298 | 298 | version: "2.5.0" |
| 299 | 299 | }, |
| 300 | 300 | |
| 301 | | - Thendral: { |
| | 301 | + Thendral: { |
| 302 | 302 | eot: "Taml/ThendralUni.eot", |
| 303 | 303 | ttf: "Taml/ThendralUni.ttf", |
| 304 | 304 | woff: "Taml/ThendralUni.woff", |
| 305 | 305 | version: "1.0" |
| 306 | 306 | }, |
| 307 | 307 | |
| 308 | | - Thenee: { |
| | 308 | + Thenee: { |
| 309 | 309 | eot: "Taml/TheneeUni.eot", |
| 310 | 310 | ttf: "Taml/TheneeUni.ttf", |
| 311 | 311 | woff: "Taml/TheneeUni.woff", |
| — | — | @@ -353,7 +353,7 @@ |
| 354 | 354 | am: [ "AbyssinicaSIL" ], |
| 355 | 355 | as: [ "Lohit Assamese" ], |
| 356 | 356 | bh: [ "Lohit Devanagari" ], |
| 357 | | - bho: [ "Lohit Devanagari" ], |
| | 357 | + bho: [ "Lohit Devanagari" ], |
| 358 | 358 | bn: [ "Lohit Bengali" ], |
| 359 | 359 | bpy: [ "Lohit Bengali" ], |
| 360 | 360 | cdo: [ "Charis SIL" ], |
| — | — | @@ -372,7 +372,7 @@ |
| 373 | 373 | ml: [ "AnjaliOldLipi" ], |
| 374 | 374 | mr: [ "Lohit Devanagari" ], |
| 375 | 375 | my: [ "Masterpiece Uni Sans", "Padauk-Regular", "Myanmar3", "Yunghkio" ], |
| 376 | | - ne: [ "Lohit Devanagari", "Madan" ], |
| | 376 | + ne: [ "Lohit Devanagari", "Madan" ], |
| 377 | 377 | or: [ "Lohit Oriya" , "Utkal" ], |
| 378 | 378 | pa: [ "Lohit Punjabi", "Saab" ], |
| 379 | 379 | sa: [ "Lohit Devanagari" ], |
| — | — | @@ -383,5 +383,7 @@ |
| 384 | 384 | ti: [ "AbyssinicaSIL" ] |
| 385 | 385 | } |
| 386 | 386 | }; |
| 387 | | - $.extend( mw.webfonts.config, config); |
| | 387 | + |
| | 388 | + $.extend( mw.webfonts.config, config ); |
| | 389 | + |
| 388 | 390 | } ) ( jQuery ); |