Commit 91321ac4 authored by Jim Tittsler's avatar Jim Tittsler
Browse files

Adopt Prettier. 

https://github.com/prettier/prettier
parent e41c4d9d

.eslintrc.json

+4 −10
Original line number Diff line number Diff line
@@ -5,16 +5,10 @@ 
        "es6": true,

        "node": true

    },

    "parserOptions": {

        "sourceType": "script"

    },

    "extends": "eslint:recommended",

    "rules": {

        "no-const-assign": "warn",

        "no-this-before-super": "warn",

        "no-undef": "warn",

        "no-unreachable": "warn",

        "no-console": "off",

        "no-unused-vars": "off",

        "constructor-super": "warn",

        "valid-typeof": "warn"

        "no-inner-declarations": "off"

    }

}

course.js

+469 −416

File changed.

Preview size limit exceeded, changes collapsed.

courseWP.js

+543 −484

File changed.

Preview size limit exceeded, changes collapsed.

package.json

+14 −4
Original line number Diff line number Diff line 
{

  "name": "wecourse",

  "version": "0.9.3",

  "version": "0.9.7",

  "author": "Jim Tittsler <jim@oerfoundation.org>",

  "description": "build a static course from WikiEducator open resources",

  "keywords": ["WikiEducator", "OERu"],

  "keywords": [

    "WikiEducator",

    "OERu"

  ],

  "bugs": {

    "email": "wikieducator-tech@googlegroups.com"

  },
@@ -21,8 +24,15 @@ 
  "bin": {

    "course": "course.js"

  },

  "scripts":{

    "format": "./node_modules/.bin/prettier --write *.js themes/*.js",

    "lint": "./node_modules/.bin/eslint *.js themes/*.js"

  },

  "engines": {

    "node": ">=6.0.0"

  },

  "devDependencies": {

    "eslint": "^4.0.0",

    "prettier": "^1.4.4"

  }

}

themes/default.js

+118 −65
Original line number Diff line number Diff line 
/* jshint node: true, multistr: true, trailing: true */

module.exports = {

  version: '0.0.1',

  version: "0.0.1",



  // emit headers

  header: function($, opt) {

    $('head').append('\

<link rel="stylesheet" href="' + opt['--urlprefix'] + '/css/bootstrap.min.css">\n\

    $("head").append(

      '\

<link rel="stylesheet" href="' +

        opt["--urlprefix"] +

        '/css/bootstrap.min.css">\n\

<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">\n\

    <!--[if lt IE 9]>\n\

      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>\n\

      <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>\n\

    <![endif]-->\n\

<link rel="stylesheet" href="' + opt['--urlprefix'] + '/css/we.css">\n');

      $('body').append('<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>\n\

  <script src="' + opt['--urlprefix'] + '/js/we.js"></script>\n');

<link rel="stylesheet" href="' +

        opt["--urlprefix"] +

        '/css/we.css">\n'

    );

    $("body").append(

      '<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>\n\

  <script src="' +

        opt["--urlprefix"] +

        '/js/we.js"></script>\n'

    );

  },



  footer: function($, opt, pages, pi) {

    $('#footer').addClass('container')

      .prepend('<div class="ilogo"><a href="' + opt['--link'] + '"><img src="' + opt['--urlprefix'] + '/img/' + opt['--logo'] + '"></a></div>');

    $('#footer-places').append('<li><a href="http://wikieducator.org' + pages[pi] + '?action=history">Authors</a></li>');

    $("#footer")

      .addClass("container")

      .prepend(

        '<div class="ilogo"><a href="' +

          opt["--link"] +

          '"><img src="' +

          opt["--urlprefix"] +

          "/img/" +

          opt["--logo"] +

          '"></a></div>'

      );

    $("#footer-places").append(

      '<li><a href="http://wikieducator.org' +

        pages[pi] +

        '?action=history">Authors</a></li>'

    );

    // move the license icon

    $('#footer-copyrightico').detach()

      .appendTo('#footer-places');

    $('#footer-icons').remove();

    $('#footer-copyrightico a')

      .attr('rel', 'license');

    $("#footer-copyrightico").detach().appendTo("#footer-places");

    $("#footer-icons").remove();

    $("#footer-copyrightico a").attr("rel", "license");

  },



  wrap: function($) {

    $('body').wrapInner('<div id="bodyInner"></div>');

    $('#content').wrap('<div id="WEcontentcontainer" class="container"/>');

    $("body").wrapInner('<div id="bodyInner"></div>');

    $("#content").wrap('<div id="WEcontentcontainer" class="container"/>');

  },



  nav: function($, opt, pages, pi, outline, getPrev, getNext) {

    var i, l, j,

        l2, l2start, l2end, pno,

        actives, pinfo, psinfo, subclasses,

    var i,

      l,

      j,

      l2,

      l2start,

      l2end,

      pno,

      actives,

      pinfo,

      psinfo,

      subclasses,

      classes = [];

    var nb = '<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">\n\

    var nb =

      '<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">\n\

    <div class="navbar-inner">\n\

    <div class="container-fluid">\n\

      <div id="course-name" class="navbar-header">\n\
@@ -48,12 +78,17 @@ module.exports = { 
          <span class="icon-bar"></span>\n\

          <span class="icon-bar"></span>\n\

        </button>\n\

        <a class="navbar-brand" href="' + opt['--urlprefix'] + '">' + opt['--brand'] + '</a>\n\

        <a class="navbar-brand" href="' +

      opt["--urlprefix"] +

      '">' +

      opt["--brand"] +

      '</a>\n\

      </div>\n\

      <div id="wembar" class="collapse navbar-collapse">\n\

        <ul class="nav navbar-nav">\n';

    if (opt['--scan']) {

      nb += '<li>\n\

    if (opt["--scan"]) {

      nb +=

        '<li>\n\

            <a id="scanpagetoggle" data-toggle="modal" data-target="#scanpage"><span style="font-size: 18px;" class="glyphicon glyphicon-tree-conifer"></span></a>\n\

          </li>\n';

    }
@@ -62,34 +97,34 @@ module.exports = { 
    for (i = 1; i < l; i++) {

      classes = [];

      if (actives.indexOf(i) > -1) {

        classes.push('active');

        classes.push("active");

      }

      pinfo = outline[i];

      if (pinfo.depth === 0) {

        if (pinfo.hasChildren) {

          classes.push('dropdown');

          nb += '<li class="' + classes.join(' ') + '">';

          classes.push("dropdown");

          nb += '<li class="' + classes.join(" ") + '">';

          nb += '<a href="#" class="dropdown-toggle" data-toggle="dropdown">';

          nb += pinfo.text;

          //nb += ' ' + i;

          nb += ' <b class="caret"></b>';

          nb += '</a>';

          nb += "</a>";

          // submenu here

          nb += '<ul class="dropdown-menu">\n';

          for (j = i + 1; j < l; j++) {

            subclasses = [];

            if (actives.indexOf(j) > -1) {

              subclasses.push('active');

              subclasses.push("active");

            }

            psinfo = outline[j];

            if (psinfo.depth === 0) {

              break;

            } else if (psinfo.depth === 1) {

              nb += '<li';

              nb += "<li";

              if (classes.length) {

                nb += ' class="' + subclasses.join(' ') + '"';

                nb += ' class="' + subclasses.join(" ") + '"';

              }

              nb += '>';

              nb += ">";

              var lurl = psinfo.url;

              if (!lurl) {

                lurl = outline[getNext(j, pages)].url;
@@ -98,25 +133,26 @@ module.exports = { 
                nb += '<a href="' + lurl + '">';

                nb += psinfo.text;

                //nb += ' ' + i + ',' + j;

                nb += '</a>';

                nb += "</a>";

              } else {

                nb += psinfo.text;

              }

              nb += '</li>\n';

              nb += "</li>\n";

            }

          }

          nb += '</ul>\n';

          nb += '</li>\n';

          nb += "</ul>\n";

          nb += "</li>\n";

        } else if (pinfo.url) {

          nb += '<li><a href="' + pinfo.url + '">';

          nb += pinfo.text;

          nb += '</a></li>\n';

          nb += "</a></li>\n";

        } else {

          nb += '<li>' + pinfo.text + '</li>';

          nb += "<li>" + pinfo.text + "</li>";

        }

      }

    }

    nb += '</ul>\n\

    nb +=

      '</ul>\n\

    <p class="navbar-text navbar-right"><a id="weUser" href="#" class="navbar-link"></a></p>\n\

    </div>\n\

    </div>\n\
@@ -124,8 +160,9 @@ module.exports = { 
  </nav>\n';



    // third level navbar

    if (!opt['--rthird'] && outline[pi].depth === 2) {

      nb += '<nav class="navbar navbar-default" role="navigation">\n\

    if (!opt["--rthird"] && outline[pi].depth === 2) {

      nb +=

        '<nav class="navbar navbar-default" role="navigation">\n\

            <div class="container-fluid">\n\

              <div class="navbar-header">\n\

                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#l2nav">\n\
@@ -152,40 +189,56 @@ module.exports = { 
      }

      var l2text;

      for (l2 = l2start; l2 < l2end; l2++) {

        nb += '<li' + ((l2 === pi) ? ' class="active"' : '') + '><a href="' + outline[l2].url;

        nb +=

          "<li" +

          (l2 === pi ? ' class="active"' : "") +

          '><a href="' +

          outline[l2].url;

        //l2text = pno + '';

        l2text = '<span class="glyphicon glyphicon-file"></span>';

        if (opt['--completethird']) {

          nb += '" title="' + outline[l2].text + '">' + outline[l2].text + '</a></li>\n';

        if (opt["--completethird"]) {

          nb +=

            '" title="' +

            outline[l2].text +

            '">' +

            outline[l2].text +

            "</a></li>\n";

        } else {

          nb += '" title="' + outline[l2].text + '">' + (((l2 >= pi-1) && (l2 <= pi+1)) ? outline[l2].text : l2text) + '</a></li>\n';

          nb +=

            '" title="' +

            outline[l2].text +

            '">' +

            (l2 >= pi - 1 && l2 <= pi + 1 ? outline[l2].text : l2text) +

            "</a></li>\n";

        }

      }



      nb += '   </ul>\n\

      nb +=

        "   </ul>\n\

              </div>\n\

            </div>\n\

          </nav>\n';

          </nav>\n";

    }



    $('body').prepend(nb);

    $("body").prepend(nb);

  },



  prevnext: function($, pl, nl) {

    $('#bodyContent').after('<ul id="weBottomNav" class="pager"></ul>');

    $("#bodyContent").after('<ul id="weBottomNav" class="pager"></ul>');

    if (pl) {

      $('#weBottomNav').append('<li class="previous"><a href="' + pl + '">&larr; Prev</a></li>');

      $("#weBottomNav").append(

        '<li class="previous"><a href="' + pl + '">&larr; Prev</a></li>'

      );

    }

    if (nl) {

      $('#weBottomNav').append('<li class="next"><a href="' + nl + '">Next &rarr;</a></li>');

      $("#weBottomNav").append(

        '<li class="next"><a href="' + nl + '">Next &rarr;</a></li>'

      );

    }

  },



  process: function($) {

    $('.WEbutton')

      .removeAttr('style')

      .removeClass('.WEbutton');

    $('section#main').find('img').addClass('img-responsive');

    $(".WEbutton").removeAttr("style").removeClass(".WEbutton");

    $("section#main").find("img").addClass("img-responsive");

  }

};