Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove fontdeck (service no longer exists) #395

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ If you want to build a JS file with only specific modules you can specify them o

$ rake compile['custom google typekit']

This will compile a JS file with only the `custom`, `google` and `typekit` modules. The available modules are: `custom`, `google`, `typekit`, `ascender`, `monotype`, `fontdeck`. By default all modules are included.
This will compile a JS file with only the `custom`, `google` and `typekit` modules. The available modules are: `custom`, `google`, `typekit`, `ascender`, `monotype`. By default all modules are included.

## Demos

Expand Down
15 changes: 1 addition & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Web Font Loader

Web Font Loader gives you added control when using linked fonts via `@font-face`. It provides a common interface to loading fonts regardless of the source, then adds a standard set of events you may use to control the loading experience. The Web Font Loader is able to load fonts from [Google Fonts](http://www.google.com/fonts/), [Typekit](http://www.typekit.com/), [Fonts.com](http://www.fonts.com/), and [Fontdeck](http://fontdeck.com/), as well as self-hosted web fonts. It is co-developed by [Google](http://www.google.com/) and [Typekit](http://www.typekit.com).
Web Font Loader gives you added control when using linked fonts via `@font-face`. It provides a common interface to loading fonts regardless of the source, then adds a standard set of events you may use to control the loading experience. The Web Font Loader is able to load fonts from [Google Fonts](http://www.google.com/fonts/), [Typekit](http://www.typekit.com/) and [Fonts.com](http://www.fonts.com/), as well as self-hosted web fonts. It is co-developed by [Google](http://www.google.com/) and [Typekit](http://www.typekit.com).

[![Build Status](https://travis-ci.org/typekit/webfontloader.svg?branch=master)](https://travis-ci.org/typekit/webfontloader)

Expand All @@ -14,7 +14,6 @@ Web Font Loader gives you added control when using linked fonts via `@font-face`
* [Modules](#modules)
* [Adobe Edge Web Fonts](#adobe-edge-web-fonts)
* [Custom](#custom)
* [Fontdeck](#fontdeck)
* [Fonts.com](#fontscom)
* [Google](#google)
* [Typekit](#typekit)
Expand Down Expand Up @@ -275,18 +274,6 @@ WebFontConfig = {

Tests strings should be specified on a per font basis and contain at least one character. If not specified the default test string (`BESbswy`) is used.

### Fontdeck

To use the [Fontdeck](http://fontdeck.com/) module, specify the ID of your website. You can find this ID on the website page within your account settings.

```javascript
WebFontConfig = {
fontdeck: {
id: 'xxxxx'
}
};
```

### Fonts.com

When using [Fonts.com web fonts](http://www.fonts.com/web-fonts/) specify your Project ID.
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ file "webfontloader.js" => "target/webfont.js" do
end

file "target/webfont.js", [:modules] => SourceJs + ["target"] do |t, args|
args.with_defaults(:modules => 'custom google typekit monotype fontdeck')
args.with_defaults(:modules => 'custom google typekit monotype')

modules = args[:modules].split ' '

Expand Down Expand Up @@ -125,7 +125,7 @@ desc "Creates debug version into target/webfont.js"
task :debug, [:modules] => "target/webfont_debug.js"

file "target/webfont_debug.js", [:modules] => SourceJs + ["target"] do |t, args|
args.with_defaults(:modules => 'custom google typekit monotype fontdeck')
args.with_defaults(:modules => 'custom google typekit monotype')

modules = args[:modules].split ' '

Expand Down
75 changes: 0 additions & 75 deletions lib/webfontloader/demo/public/fontdeck.html

This file was deleted.

2 changes: 0 additions & 2 deletions lib/webfontloader/demo/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ <h2>Modules</h2>
<li><a href="/google.html">Google / Web Font Loader</a>: Load fonts from Google with Web Font Loader.</li>
<li><a href="/typekit.html">Typekit / Web Font Loader</a>: Load fonts from Typekit with Web Font Loader.</li>
<li><a href="/custom.html">Custom / Web Font Loader</a>: Load fonts from your own CSS with Web Font Loader.</li>
<li><a href="/fontdeck.html">Fontdeck / Web Font Loader</a>: Load fonts from Fontdeck with Web Font Loader.</li>
<li><a href="/monotype.html">Monotype / Web Font Loader</a>: Load fonts from fonts.com with Web Font Loader.</li>
</ol>

Expand All @@ -35,7 +34,6 @@ <h2>Modules in Iframes</h2>
<li><a href="/google-iframe.html">Google / Web Font Loader</a>: Load fonts from Google in a child iframe with Web Font Loader.</li>
<li><a href="/typekit-iframe.html">Typekit / Web Font Loader</a>: Load fonts from Typekit in a child iframe with Web Font Loader.</li>
<li><a href="/custom-iframe.html">Custom / Web Font Loader</a>: Load fonts from your own CSS in a child iframe with Web Font Loader.</li>
<li>Fontdeck / Web Font Loader: Their demo fonts seem to be broken at the moment, so we don't have an iframe demo of this module.</li>
<li><a href="/monotype-iframe.html">Monotype / Web Font Loader</a>: Load fonts from fonts.com in a child iframe with Web Font Loader.</li>
</ol>

Expand Down
3 changes: 1 addition & 2 deletions spec/deps.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ goog.addDependency("../../src/core/fontmoduleloader.js", ["webfont.FontModuleLoa
goog.addDependency("../../src/core/fontruler.js", ["webfont.FontRuler"], []);
goog.addDependency("../../src/core/fontwatcher.js", ["webfont.FontWatcher"], ["webfont.FontWatchRunner","webfont.NativeFontWatchRunner"]);
goog.addDependency("../../src/core/fontwatchrunner.js", ["webfont.FontWatchRunner"], ["webfont.Font","webfont.FontRuler"]);
goog.addDependency("../../src/core/initialize.js", ["webfont"], ["webfont.WebFont","webfont.modules.Typekit","webfont.modules.Fontdeck","webfont.modules.Monotype","webfont.modules.Custom","webfont.modules.google.GoogleFontApi"]);
goog.addDependency("../../src/core/initialize.js", ["webfont"], ["webfont.WebFont","webfont.modules.Typekit","webfont.modules.Monotype","webfont.modules.Custom","webfont.modules.google.GoogleFontApi"]);
goog.addDependency("../../src/core/nativefontwatchrunner.js", ["webfont.NativeFontWatchRunner"], ["webfont.Font"]);
goog.addDependency("../../src/core/webfont.js", ["webfont.WebFont"], ["webfont.DomHelper","webfont.EventDispatcher","webfont.FontWatcher","webfont.FontModuleLoader"]);
goog.addDependency("../../src/modules/custom.js", ["webfont.modules.Custom"], ["webfont.Font", "webfont.StyleSheetWaiter"]);
goog.addDependency("../../src/modules/fontdeck.js", ["webfont.modules.Fontdeck"], ["webfont.Font"]);
goog.addDependency("../../src/modules/google/fontapiparser.js", ["webfont.modules.google.FontApiParser"], ["webfont.Font"]);
goog.addDependency("../../src/modules/google/fontapiurlbuilder.js", ["webfont.modules.google.FontApiUrlBuilder"], []);
goog.addDependency("../../src/modules/google/googlefontapi.js", ["webfont.modules.google.GoogleFontApi"], ["webfont.modules.google.FontApiUrlBuilder","webfont.modules.google.FontApiParser","webfont.FontWatchRunner", "webfont.StyleSheetWaiter"]);
Expand Down
1 change: 0 additions & 1 deletion spec/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<script src="../spec/modules/google/fontapiurlbuilder_spec.js"></script>
<script src="../spec/modules/google/googlefontapi_spec.js"></script>
<script src="../spec/modules/custom_spec.js"></script>
<script src="../spec/modules/fontdeck_spec.js"></script>
<script src="../spec/modules/monotype_spec.js"></script>
<script src="../spec/modules/typekit_spec.js"></script>

Expand Down
99 changes: 0 additions & 99 deletions spec/modules/fontdeck_spec.js

This file was deleted.

12 changes: 0 additions & 12 deletions src/core/initialize.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ goog.provide('webfont');
goog.require('webfont.WebFont');

goog.require('webfont.modules.Typekit');
goog.require('webfont.modules.Fontdeck');
goog.require('webfont.modules.Monotype');
goog.require('webfont.modules.Custom');
goog.require('webfont.modules.google.GoogleFontApi');
Expand All @@ -13,11 +12,6 @@ goog.require('webfont.modules.google.GoogleFontApi');
*/
var INCLUDE_CUSTOM_MODULE = false;

/**
* @define {boolean}
*/
var INCLUDE_FONTDECK_MODULE = false;

/**
* @define {boolean}
*/
Expand Down Expand Up @@ -54,12 +48,6 @@ if (INCLUDE_CUSTOM_MODULE) {
});
}

if (INCLUDE_FONTDECK_MODULE) {
webFontLoader.addModule(webfont.modules.Fontdeck.NAME, function (configuration, domHelper) {
return new webfont.modules.Fontdeck(domHelper, configuration);
});
}

if (INCLUDE_MONOTYPE_MODULE) {
webFontLoader.addModule(webfont.modules.Monotype.NAME, function (configuration, domHelper) {
return new webfont.modules.Monotype(domHelper, configuration);
Expand Down
3 changes: 0 additions & 3 deletions src/modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ google:
- modules/google/fontapiparser.js
- modules/google/googlefontapi.js

fontdeck:
- modules/fontdeck.js

typekit:
- modules/typekit.js

Expand Down
66 changes: 0 additions & 66 deletions src/modules/fontdeck.js

This file was deleted.

Loading