Skip to content

Commit 793ba76

Browse files
melvincarvalhomelvincarvalho
committed
Merge remote-tracking branch 'upstream/master'
2 parents 0132233 + 221f204 commit 793ba76

File tree

252 files changed

+989
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+989
-145
lines changed

‎.babelrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": [ "es2015" ]
3+
}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
node_modules
2+
dist
3+
lib

‎lib/icons/noun_145978.svg‎

Lines changed: 1 addition & 0 deletions

‎lib/icons/noun_289243.svg‎

Lines changed: 1 addition & 0 deletions

‎lib/icons/noun_534313.svg‎

Lines changed: 1 addition & 0 deletions

‎package.json‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,21 @@
22
"name": "solid-ui",
33
"version": "0.2.1",
44
"description": "UI library for writing Solid read-write-web applications",
5-
"main": "./index.js",
5+
"main": "./lib/index.js",
6+
"files": [
7+
"lib",
8+
"dist"
9+
],
610
"scripts": {
7-
"build-browserified": "browserify -r ./index.js:solid-ui --exclude 'xhr2' --exclude 'rdflib' > dist/solid-ui.js",
8-
"build-minified": "browserify -r ./index.js:solid-ui --exclude 'xhr2' --exclude 'rdflib' -d -p [minifyify --no-map] > dist/solid.min.js",
9-
"build": "npm run clean && mkdir -p dist/resources && npm run standard && npm run build-browserified && npm run build-minified",
10-
"build-qunit-resources": "browserify -r ./test/resources/profile-ldnode.js:test-ldnode-profile --exclude 'xhr2' --exclude 'rdflib' > dist/resources/test-ldnode-profile.js",
11-
"clean": "rm -rf dist/",
12-
"standard": "standard lib/*",
13-
"tape": "tape test/unit/*.js",
14-
"test": "npm run standard && npm run tape",
15-
"qunit": "npm run standard && npm run build-browserified && open test/integration/index.html"
11+
"build-lib": "babel src -d lib",
12+
"build-browserified": "browserify -r ./src/index.js:solid-ui -t babelify --exclude 'xhr2' > dist/solid-ui.js",
13+
"build-minified": "browserify -r ./src/index.js:solid-ui -t babelify --exclude 'xhr2' -d -p [minifyify --no-map] > dist/solid.min.js",
14+
"prebuild": "npm run clean && mkdir -p dist",
15+
"build": "npm run build-lib && npm run build-browserified && npm run build-minified",
16+
"clean": "rm -rf dist/ && rm -rf lib/",
17+
"standard": "standard src/*",
18+
"pretest": "npm run standard",
19+
"test": "echo 'No test suite. Add tests!' && exit 1"
1620
},
1721
"repository": {
1822
"type": "git",
@@ -21,24 +25,34 @@
2125
"keywords": [
2226
"solid",
2327
"decentralized",
24-
"widgets", "ui",
28+
"widgets",
29+
"ui",
2530
"web",
2631
"rdf",
2732
"ldp",
2833
"linked",
2934
"data"
3035
],
3136
"author": "Tim Berners-Lee <timbl@mit.edu>",
37+
"contributors": [
38+
"Daniel Friedman <danielf@mit.edu>"
39+
],
3240
"license": "MIT",
3341
"bugs": {
3442
"url": "https://github.com/linkeddata/solid-ui/issues"
3543
},
3644
"homepage": "https://github.com/linkeddata/solid-ui",
3745
"dependencies": {
38-
"solid-client": "",
39-
"rdflib": ""
46+
"escape-html": "^1.0.3",
47+
"node-uuid": "^1.4.7",
48+
"rdflib": "^0.12.1",
49+
"solid-client": "^0.22.4",
50+
"solid-web-client": "0.0.9"
4051
},
4152
"devDependencies": {
53+
"babel-cli": "^6.18.0",
54+
"babel-preset-es2015": "^6.18.0",
55+
"babelify": "^7.3.0",
4256
"browserify": "^13.0.0",
4357
"minifyify": "^7.2.1",
4458
"qunit": "^0.9.0",

lib/acl-control.js renamed to src/acl-control.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
// throwing away all the user's work.
77
var UI = {}
88

9-
UI.acl = require('./acl.js')
10-
UI.ns = require('./ns.js')
11-
UI.widgets = require('./widgets.js')
9+
UI.acl = require('./acl')
10+
UI.ns = require('./ns')
11+
UI.widgets = require('./widgets')
1212
UI.utils = require('./utils')
1313
UI.aclControl = module.exports = {}
1414

@@ -239,8 +239,9 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
239239
}
240240
}
241241
var tr = middleTable.appendChild(
242-
UI.widgets.personTR(
243-
dom, $rdf.sym(pred), $rdf.sym(obj), opt))
242+
UI.widgets.personTR(dom, $rdf.sym(pred), $rdf.sym(obj), opt))
243+
tr.predObj = [pred.uri, obj.uri]
244+
244245
}
245246

246247
var syncCombo = function (combo) {
@@ -395,12 +396,12 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
395396

396397
UI.acl.getACLorDefault(doc, function (ok, p2, targetDoc, targetACLDoc, defaultHolder, defaultACLDoc) {
397398
var defa = !p2
398-
box.isContainer = targetDoc.uri.slice(-1) === '/' // Give default for all directories
399399
// @@ Could also set from classes ldp:Container etc etc
400400
if (!ok) {
401401
statusBlock.textContent += 'Error reading ' + (defa ? ' default ' : '') + 'ACL.' +
402402
' status ' + targetDoc + ': ' + targetACLDoc
403403
} else {
404+
box.isContainer = targetDoc.uri.slice(-1) === '/' // Give default for all directories
404405
if (defa) {
405406
var defaults = kb.each(undefined, ACL('defaultForNew'), defaultHolder, defaultACLDoc)
406407
if (!defaults.length) {

lib/acl.js renamed to src/acl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var acl = module.exports = {}
55

66
var UI = {
77
acl: acl,
8-
icons: require('./iconBase.js'),
8+
icons: require('./iconBase'),
99
log: require('./log'),
1010
ns: require('./ns'),
1111
store: require('./store'),

lib/convert.sed renamed to src/convert.sed

File renamed without changes.

lib/iconBase.js renamed to src/iconBase.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if (module.scriptURI) { // FF extension
77
module.exports.originalIconBase = '' +
88
module.scriptURI.slice(0, module.scriptURI.lastIndexOf('/')) + '/originalIcons/'
99
} else { // Node or browserify
10-
var iconsOnGithub = 'https://linkeddata.github.io/solid-ui/lib'
10+
var iconsOnGithub = 'https://linkeddata.github.io/solid-ui/src'
1111

1212
if (typeof $SolidTestEnvironment !== 'undefined' && $SolidTestEnvironment.iconBase ){
1313
module.exports.iconBase = $SolidTestEnvironment.iconBase

0 commit comments

Comments
 (0)