Skip to content

Commit

Permalink
fix(site): fixed github-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
BowlingX committed Feb 12, 2016
1 parent 14af9ae commit 3dfbec2
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 21 deletions.
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
permalink: pretty

exclude: ['src', 'scripts', 'assets', 'node_modules', 'bower_components', 'coverage','examples']
version: 'v0.6.1'
downloadLink: 'https://github.com/BowlingX/marklib/archive/v.0.6.1.zip'
version: 'v0.6.5'
downloadLink: 'https://github.com/BowlingX/marklib/archive/v.0.6.5.zip'
1 change: 1 addition & 0 deletions assets/marklib.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ body {
}

.highlight {
margin:0;
pre {
max-width: $maxWidth;
margin: 0 auto;
Expand Down
4 changes: 4 additions & 0 deletions build/css/styles.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/css/styles.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/marklib.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/marklib.min.map

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions build/js/site.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/js/site.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/site.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/site.min.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/styles.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/styles.min.map

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/main/modules/Site.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* global localStorage, document */

import Marklib from 'modules/Marklib';
import { Rendering } from 'modules/Marklib';
import { Tooltip } from 'flexcss';

const KEY_ENTER = 13;
Expand All @@ -24,7 +24,7 @@ document.addEventListener("DOMContentLoaded", () => {

const render = (autoMarkText, cp, length) => {
let c = cp;
const r = new Marklib.Rendering(document, {
const r = new Rendering(document, {
className: classNames
});
const range = document.createRange();
Expand Down Expand Up @@ -80,7 +80,7 @@ document.addEventListener("DOMContentLoaded", () => {


savedRanges.forEach((range) => {
const marker = new Marklib.Rendering(document);
const marker = new Rendering(document);
try {
marker.renderWithResult(range);
allRanges.push(marker);
Expand Down Expand Up @@ -109,7 +109,7 @@ document.addEventListener("DOMContentLoaded", () => {
const actionMark = () => {
try {
const selection = document.getSelection();
const renderer = new Marklib.Rendering(document);
const renderer = new Rendering(document);
const result = renderer.renderWithRange(selection.getRangeAt(0));

renderer.on('click', onClick);
Expand Down Expand Up @@ -141,4 +141,4 @@ document.addEventListener("DOMContentLoaded", () => {
});
});

export default Marklib;
export default Rendering;

0 comments on commit 3dfbec2

Please sign in to comment.