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.

Sign up for GitHub

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

Jump to bottom

SAKIII-5723 - Fix Widget Configuration Test Suite #2179

Merged
merged 1 commit into from Jun 27, 2012
Merged

SAKIII-5723 - Fix Widget Configuration Test Suite #2179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion devwidgets/embedcontent/config.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"defaultOptions": {
"defaultConfiguration": {
"embedmethod": "original",
"layout": "vertical",
"showDetails": false,
Expand Down
4 changes: 2 additions & 2 deletions devwidgets/embedcontent/javascript/embedcontent.js
View file
Open in desktop
Expand Up @@ -546,8 +546,8 @@ require(["jquery", "sakai/sakai.api.core"], function($, sakai) {
} else {
toggleTabs(e.target);
}
if (tab === 'display' && !defaultsSet && !wData && sakai.widgets.embedcontent.defaultOptions) {
setDefaultOptions(sakai.widgets.embedcontent.defaultOptions);
if (tab === 'display' && !defaultsSet && !wData && sakai.widgets.embedcontent.defaultConfiguration) {
setDefaultOptions(sakai.widgets.embedcontent.defaultConfiguration);
defaultsSet = true;
}
return false;
Expand Down
4 changes: 3 additions & 1 deletion devwidgets/pagetitle/config.json
View file
Open in desktop
Expand Up @@ -8,8 +8,10 @@
"name": "Page Title"
}
},
"id": "pagetitle",
"indexFields": ["content"],
"personalportal": false,
"sakaidocs": false,
"url": "/devwidgets/pagetitle/pagetitle.html"
"url": "/devwidgets/pagetitle/pagetitle.html",
"type": "sakai"
}
1 change: 0 additions & 1 deletion tests/qunit/js/devwidgets.js
View file
Open in desktop
Expand Up @@ -77,7 +77,6 @@ require(["jquery", "sakai/sakai.api.core"], function($, sakai){
"joinrequestbuttons",
"joinrequests",
"lhnavigation",
"login",
"mycontacts",
"mycontent",
"mygroups",
Expand Down
15 changes: 0 additions & 15 deletions tests/qunit/tests/unit/js/widgets.js
View file
Open in desktop
Expand Up @@ -10,9 +10,6 @@ require(
function($, sakai) {

var widgetProperties = [{
"name": "ca",
"type": "boolean"
}, {
"name": "hasSettings",
"type": "boolean"
}, {
Expand Down Expand Up @@ -50,18 +47,6 @@ require(
"name": "url",
"required": true,
"type": "string"
}, {
"name": "groupdashboard",
"type": "boolean"
}, {
"name": "grouppages",
"type": "boolean"
}, {
"name": "userdashboard",
"type": "boolean"
}, {
"name": "userpages",
"type": "boolean"
}, {
"name": "deletable",
"type": "boolean"
Expand Down