Skip to content
This repository has been archived by the owner on Jan 10, 2024. It is now read-only.

Commit

Permalink
Merge pull request #10 from metadaddy-sfdc/master
Browse files Browse the repository at this point in the history
Add license file, remove redundant HTML sanitizer
  • Loading branch information
Pat Patterson committed Dec 19, 2013
2 parents 952a54d + 8f828b6 commit fb232b3
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 56 deletions.
31 changes: 31 additions & 0 deletions license
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
This project is licensed under the 'BSD 3-Clause' license [1], also known as
the 'Modified BSD' license [2].

[1] http://www.opensource.org/licenses/BSD-3-Clause
[2] http://www.gnu.org/licenses/license-list.html#ModifiedBSD

Copyright (c) 2010, Salesforce.com
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of Salesforce.com nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1 change: 0 additions & 1 deletion src/pages/FacebookInboxPage.page
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
title="Force.com Toolkit for Facebook - Sample Page">
<apex:stylesheet value="{!URLFOR($Resource.style)}"/>
<script src="{!$Resource.jquery}"></script>
<script src="{!$Resource.html_sanitizer}"></script>
<script>
var $j = jQuery.noConflict();
</script>
Expand Down
4 changes: 1 addition & 3 deletions src/pages/FacebookSamplePage.page
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<!-- Check that FB user matches user in site -->
<c:FacebookCheckUser appId="{!appId}" userId="{!me.id}" timeout="5" />
<script src="{!$Resource.jquery}"></script>
<script src="{!$Resource.html_sanitizer}"></script>
<script>
var $j = jQuery.noConflict();

Expand All @@ -17,8 +16,6 @@
// get it from an action method and pass it here
FacebookSampleController.getFriends('{!accessToken}', function(result, event) {
if (event.status) {
// result comes back escaped - use Caja to unescape it
//var json = html.unescapeEntities(result);
var friends = JSON.parse(result);
// Truncate the array to a maximum of 10 friends
friends.data.length = Math.min(10, friends.data.length);
Expand All @@ -27,6 +24,7 @@
alert(event.message + '\n' + JSON.stringify(event));
}
}, {
// Tell remote method not to escape the response
escape: false
});
}
Expand Down
1 change: 0 additions & 1 deletion src/pages/FacebookTestUser.page
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
title="Force.com Toolkit for Facebook - User Object Test Page">
<apex:stylesheet value="{!URLFOR($Resource.style)}"/>
<script src="{!$Resource.jquery}"></script>
<script src="{!$Resource.html_sanitizer}"></script>
<script>
var $j = jQuery.noConflict();

Expand Down
46 changes: 0 additions & 46 deletions src/staticresources/html_sanitizer.resource

This file was deleted.

5 changes: 0 additions & 5 deletions src/staticresources/html_sanitizer.resource-meta.xml

This file was deleted.

0 comments on commit fb232b3

Please sign in to comment.