Skip to content

Commit

Permalink
Chore(global) deprecate 'webspec' status support (closes #715)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcoscaceres committed May 6, 2016
1 parent 16bc873 commit 5b4ee3c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 43 deletions.
8 changes: 0 additions & 8 deletions js/core/css/examples-webspecs.css

This file was deleted.

5 changes: 2 additions & 3 deletions js/core/examples.js
Expand Up @@ -7,8 +7,8 @@
// be used by a containing shell to extract all examples.

define(
["text!core/css/examples.css", "text!core/css/examples-webspecs.css"],
function (css, cssKraken) {
["text!core/css/examples.css"],
function (css) {
var makeTitle = function (conf, $el, num, report) {
var txt = (num > 0) ? " " + num : ""
, $tit = $("<div class='example-title'><span>Example" + txt + "</span></div>");
Expand All @@ -28,7 +28,6 @@ define(
, num = 0
;
if ($exes.length) {
if (conf.specStatus === "webspec") css += cssKraken;
$(doc).find("head link").first().before($("<style/>").text(css));
$exes.each(function (i, ex) {
var $ex = $(ex)
Expand Down
17 changes: 5 additions & 12 deletions js/w3c/headers.js
Expand Up @@ -86,11 +86,9 @@
// - "w3c", currently the default (restrictive) license
// - "cc-by", which is experimentally available in some groups (but likely to be phased out).
// Note that this is a dual licensing regime.
// - "cc0", an extremely permissive license. This only works with the webspecs specStatus,
// and it is only recommended if you are working on a document that is intended to be
// pushed to the WHATWG
// - "w3c-software", a permissive and attributions license (but GPL-compatible). This is only
// available with webspecs and is the recommended value. It is the default for webspecs.
// - "cc0", an extremely permissive license. It is only recommended if you are working on a document that is
// intended to be pushed to the WHATWG.
// - "w3c-software", a permissive and attributions license (but GPL-compatible).
// - "w3c-software-doc", the W3C Software and Document License
// http://www.w3.org/Consortium/Legal/2015/copyright-software-and-document

Expand All @@ -103,7 +101,6 @@ define(
, "tmpl!w3c/templates/sotd.html"
, "tmpl!w3c/templates/cgbg-headers.html"
, "tmpl!w3c/templates/cgbg-sotd.html"
, "tmpl!w3c/templates/webspecs-headers.html"
],
function (hb, utils, headersTmpl, sotdTmpl, cgbgHeadersTmpl, cgbgSotdTmpl, wsHeadersTmpl) {
hb.registerHelper("showPeople", function (name, items) {
Expand Down Expand Up @@ -317,11 +314,9 @@ define(
conf.isCGBG = $.inArray(conf.specStatus, this.cgbg) >= 0;
conf.isCGFinal = conf.isCGBG && /G-FINAL$/.test(conf.specStatus);
conf.isBasic = (conf.specStatus === "base");
conf.isWebSpec = (conf.specStatus === "webspec");
conf.isRegular = (!conf.isCGBG && !conf.isBasic && !conf.isWebSpec);
conf.isRegular = (!conf.isCGBG && !conf.isBasic);
if (!conf.specStatus) msg.pub("error", "Missing required configuration: specStatus");
if (conf.isRegular && !conf.shortName) msg.pub("error", "Missing required configuration: shortName");
if (conf.isWebSpec && !conf.repository) msg.pub("error", "Missing required configuration: repository (as in 'darobin/respec')");
conf.title = doc.title || "No Title";
if (!conf.subtitle) conf.subtitle = "";
if (!conf.publishDate) {
Expand Down Expand Up @@ -370,7 +365,7 @@ define(
else if (conf.isCGBG) {
conf.prevVersion = conf.prevVersion || "";
}
else if (conf.isBasic || conf.isWebSpec) {
else if (conf.isBasic) {
conf.prevVersion = "";
}
else {
Expand Down Expand Up @@ -468,7 +463,6 @@ define(
// insert into document and mark with microformat
var bp;
if (conf.isCGBG) bp = cgbgHeadersTmpl(conf);
else if (conf.isWebSpec) bp = wsHeadersTmpl(conf);
else bp = headersTmpl(conf);
$("body", doc).prepend($(bp)).addClass("h-entry");

Expand Down Expand Up @@ -525,7 +519,6 @@ define(
if (conf.subjectPrefix !== "") conf.subjectPrefixEnc = encodeURIComponent(conf.subjectPrefix);
var sotd;
if (conf.isCGBG) sotd = cgbgSotdTmpl(conf);
else if (conf.isWebSpec) sotd = null;
else sotd = sotdTmpl(conf);
if (sotd) $(sotd).insertAfter($("#abstract"));

Expand Down
20 changes: 0 additions & 20 deletions js/w3c/templates/webspecs-headers.html

This file was deleted.

0 comments on commit 5b4ee3c

Please sign in to comment.