Author: rbaxter85
Date: Wed Aug 24 13:58:05 2011
New Revision: 1161102
URL: http://svn.apache.org/viewvc?rev=1161102&view=rev
Log:
SHINDIG-1591
Committed for Matt Hatem.
Align selection feature with 2.0 spec.
Modified:
shindig/trunk/content/samplecontainer/examples/conservcontainer/sample-actions-runner.xml
shindig/trunk/content/samplecontainer/examples/conservcontainer/sample-selection-listener.xml
shindig/trunk/features/src/main/javascript/features/selection/feature.xml
shindig/trunk/features/src/main/javascript/features/selection/selection.js
shindig/trunk/features/src/main/javascript/features/selection/selection_container.js
shindig/trunk/features/src/main/javascript/features/selection/taming.js
shindig/trunk/features/src/test/javascript/features/selection/selection_test.js
Modified:
shindig/trunk/content/samplecontainer/examples/conservcontainer/sample-actions-runner.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/conservcontainer/sample-actions-runner.xml?rev=1161102&r1=1161101&r2=1161102&view=diff
==============================================================================
---
shindig/trunk/content/samplecontainer/examples/conservcontainer/sample-actions-runner.xml
(original)
+++
shindig/trunk/content/samplecontainer/examples/conservcontainer/sample-actions-runner.xml
Wed Aug 24 13:58:05 2011
@@ -27,7 +27,7 @@
<![CDATA[
<script>
var selection;
-gadgets.selection.addSelectionListener(
+gadgets.selection.addListener(
function(s){selection = s;}
);
Modified:
shindig/trunk/content/samplecontainer/examples/conservcontainer/sample-selection-listener.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/conservcontainer/sample-selection-listener.xml?rev=1161102&r1=1161101&r2=1161102&view=diff
==============================================================================
---
shindig/trunk/content/samplecontainer/examples/conservcontainer/sample-selection-listener.xml
(original)
+++
shindig/trunk/content/samplecontainer/examples/conservcontainer/sample-selection-listener.xml
Wed Aug 24 13:58:05 2011
@@ -31,20 +31,20 @@ function selectionListener(selection) {
"selection: " + gadgets.util.escapeString(JSON.stringify(selection) + "")
+ "<br/>";
}
-function addSelectionListener() {
- gadgets.selection.addSelectionListener(selectionListener);
+function addListener() {
+ gadgets.selection.addListener(selectionListener);
document.getElementById("output").innerHTML = "Selection listener added...";
}
-function removeSelectionListener() {
- gadgets.selection.removeSelectionListener(selectionListener);
+function removeListener() {
+ gadgets.selection.removeListener(selectionListener);
document.getElementById("output").innerHTML = "";
}
</script>
<div>
-<input type="button" value="Add Selection Listener"
onclick="addSelectionListener()"/>
-<input type="button" value="Remove Selection Listener"
onclick="removeSelectionListener()"/>
+<input type="button" value="Add Selection Listener" onclick="addListener()"/>
+<input type="button" value="Remove Selection Listener"
onclick="removeListener()"/>
</div>
<div id="output">
</div>
Modified:
shindig/trunk/features/src/main/javascript/features/selection/feature.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/selection/feature.xml?rev=1161102&r1=1161101&r2=1161102&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/selection/feature.xml
(original)
+++ shindig/trunk/features/src/main/javascript/features/selection/feature.xml
Wed Aug 24 13:58:05 2011
@@ -26,8 +26,8 @@ specific language governing permissions
<api>
<exports type="js">gadgets.selection.setSelection</exports>
<exports type="js">gadgets.selection.getSelection</exports>
- <exports type="js">gadgets.selection.addSelectionListener</exports>
- <exports type="js">gadgets.selection.removeSelectionListener</exports>
+ <exports type="js">gadgets.selection.addListener</exports>
+ <exports type="js">gadgets.selection.removeListener</exports>
</api>
</gadget>
<container>
Modified:
shindig/trunk/features/src/main/javascript/features/selection/selection.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/selection/selection.js?rev=1161102&r1=1161101&r2=1161102&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/selection/selection.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/selection/selection.js
Wed Aug 24 13:58:05 2011
@@ -54,7 +54,7 @@ gadgets['selection'] = function() {
* Registers a listener for selection.
* @param {function} listener The listener to remove.
*/
- addSelectionListener: function(listener) {
+ addListener: function(listener) {
if (typeof listener === 'function') {
// add the listener to the list
listeners.push(listener);
@@ -76,7 +76,7 @@ gadgets['selection'] = function() {
* Removes a listener for selection.
* @param {function} listener The listener to remove.
*/
- removeSelectionListener: function(listener) {
+ removeListener: function(listener) {
var index = listeners.indexOf(listener);
if (index != -1) {
listeners.splice(index, 1);
Modified:
shindig/trunk/features/src/main/javascript/features/selection/selection_container.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/selection/selection_container.js?rev=1161102&r1=1161101&r2=1161102&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/selection/selection_container.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/selection/selection_container.js
Wed Aug 24 13:58:05 2011
@@ -38,7 +38,16 @@
}
function addSelectionListener(listener) {
- listeners.push(listener);
+ if (typeof listener === 'function') {
+ listeners.push(listener);
+ }
+ }
+
+ function removeSelectionListener(listener) {
+ var index = listeners.indexOf(listener);
+ if (index != -1) {
+ listeners.splice(index, 1);
+ }
}
function router(command, param) {
@@ -70,6 +79,22 @@
*/
getSelection: function() {
return _selection;
+ },
+
+ /**
+ * Registers a listener for selection.
+ * @param {function} listener The listener to remove.
+ */
+ addListener: function(listener) {
+ addSelectionListener(listener);
+ },
+
+ /**
+ * Removes a listener for selection.
+ * @param {function} listener The listener to remove.
+ */
+ removeListener: function(listener) {
+ removeSelectionListener(listener);
}
};
});
Modified:
shindig/trunk/features/src/main/javascript/features/selection/taming.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/selection/taming.js?rev=1161102&r1=1161101&r2=1161102&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/selection/taming.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/selection/taming.js Wed
Aug 24 13:58:05 2011
@@ -2,6 +2,6 @@ var tamings___ = tamings___ || [];
tamings___.push(function(imports) {
___.grantRead(gadgets.selection, 'setSelection');
___.grantRead(gadgets.selection, 'getSelection');
- ___.grantRead(gadgets.selection, 'addSelectionListener');
- ___.grantRead(gadgets.selection, 'removeSelectionListener');
+ ___.grantRead(gadgets.selection, 'addListener');
+ ___.grantRead(gadgets.selection, 'removeListener');
});
Modified:
shindig/trunk/features/src/test/javascript/features/selection/selection_test.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/selection/selection_test.js?rev=1161102&r1=1161101&r2=1161102&view=diff
==============================================================================
---
shindig/trunk/features/src/test/javascript/features/selection/selection_test.js
(original)
+++
shindig/trunk/features/src/test/javascript/features/selection/selection_test.js
Wed Aug 24 13:58:05 2011
@@ -81,7 +81,7 @@ SelectionTest.inherits(TestCase);
var container = new osapi.container.Container({});
var callback = function() {
};
- gadgets.selection.addSelectionListener(callback);
+ gadgets.selection.addListener(callback);
this.assertRpcCalled("..", "gadgets.selection", null, "add", callback);
};
