#111 - fixing errors with examples

PaulKinlan · Nov 3, 2011 · 86f454d · 86f454d
1 parent 967e593
commit 86f454d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 37 deletions.
diff --git a/server/demos/imagestudio/pages/index.html b/server/demos/imagestudio/pages/index.html
@@ -3,43 +3,34 @@
 {% block scripts %}
   <script type="text/javascript">
     $(function() {
-       $('#choose').click(function(e) {
-        var intent = new Intent(
-            'http://webintents.org/pick',
-            'image/*');
-        window.navigator.startActivity(intent, function(intent) {
-          $("#result").attr('src', intent.data).css({ "width": "auto", "height": "auto"});
+      $('#choose').click(function(e) {
+        var intent = new Intent( 'http://webintents.org/pick', 'image/*');
+        window.navigator.startActivity(intent, function(data) {
+          var url = $.isArray(data) ? data[0] : data; 
+          $("#result").attr('src', url).css({ "width": "auto", "height": "auto"});
           $("#edit, #share, #save").removeClass("disabled")
                                    .removeAttr('disabled');
 
         });
       });
 
       $("#edit").click(function (e) {
-        var intent = new Intent(
-            'http://webintents.org/edit',
-            'image/*',
-            $("#result").attr("src"));
+        var intent = new Intent( 'http://webintents.org/edit', 'image/*', $("#result").attr("src"));
         window.navigator.startActivity(intent, function(data) {
-          $("#result").attr('src', data.data);
+          var url = $.isArray(data) ? data[0] : data; 
+          $("#result").attr('src', url);
         });
       });
 
       $('#save').click(function(e) {
-        var intent = new Intent(
-            'http://webintents.org/save',
-            'image/*',
-            $('#result').attr('src'));
+        var intent = new Intent( 'http://webintents.org/save', 'image/*', $('#result').attr('src'));
         window.navigator.startActivity(intent, function(data) {
 
         });
       });
 
       $('#share').click(function() {
-        var intent = new Intent(
-            'http://webintents.org/share',
-            'image/png',
-            $('#result').attr('src'));
+        var intent = new Intent( 'http://webintents.org/share', 'image/png', $('#result').attr('src'));
 
         window.navigator.startActivity(intent, function(data) {
 

diff --git a/server/examples/pages/intents/pick/pick_action.html b/server/examples/pages/intents/pick/pick_action.html
@@ -16,9 +16,9 @@
         return false;
       });
 
-      var intentResponse = function (intentData) {
+      var intentResponse = function (data) {
         var output = document.getElementById("output");
-        output.src = intentData.data;
+        output.src = data;
         focus();
       };
     }, false);
@@ -38,8 +38,8 @@ <h3>Code</h3>
 
 window.navigator.startActivity(intent, intentResponse);
 
-var intentResponse = function (intentData) {
+var intentResponse = function (data) {
 var output = document.getElementById("output");
-output.src = intentData.data[0];
+output.src = data[0];
 };</pre>
 {% endblock %}
diff --git a/server/examples/pages/intents/pick/pick_pick.html b/server/examples/pages/intents/pick/pick_pick.html
@@ -24,7 +24,7 @@
     var returnImage = function(e) {
       if(!!window.intent) {
         // Do some magic to return the raw data.
-        var data = [ getImageData(e.target) ]; 
+        var data = getImageData(e.target); 
 
         window.intent.postResult(data);
         setTimeout(function() { window.close();}, 500);
@@ -50,9 +50,9 @@ <h1>Kinlan's Cloud File Store</h1>
 <section>
 <p>Select a file for the app to use</p>
 <div>
-  <%= image_tag 'kitten1.jpg', :id => 'img1' %>
-  <%= image_tag 'kitten2.jpg', :id => 'img2' %>
-  <%= image_tag 'kitten3.jpg', :id => 'img3' %>
+  <img src="kitten1.jpg" id="img1" />
+  <img src="kitten2.jpg" id="img2" />
+  <img src="kitten3.jpg" id="img3" />
 </div>
 <h2>Code</h2>
 <pre>var getImageData = function(img) {
@@ -63,7 +63,7 @@ <h2>Code</h2>
 var returnImage = function(e) {
 if(!!window.intent) {
 // Do some magic to return the raw data.
-var data = [ getImageData(e.target) ] ; 
+var data = getImageData(e.target); 
 
 window.intent.postResult(data);
 setTimeout(function() { window.close();}, 500);

diff --git a/server/examples/pages/intents/share/share_action.html b/server/examples/pages/intents/share/share_action.html
@@ -12,7 +12,7 @@
         var intent = new Intent(
             "http://webintents.org/share",
             "text/uri-list",
-            [ url ]);
+            url);
 
         window.navigator.startActivity(intent);
         return false;
@@ -31,7 +31,7 @@
         var intent = new Intent(
             "http://webintents.org/share",
             "image/*",
-            [ imageData ]);
+            imageData);
 
         window.navigator.startActivity(intent);
         return false;

diff --git a/server/examples/pages/intents/shorten/shorten.html b/server/examples/pages/intents/shorten/shorten.html
@@ -34,15 +34,15 @@
         var intent = new Intent(
             "http://webintents.org/shorten",
             "text/uri-list",
-            [ url ]);
+            url);
 
         window.navigator.startActivity(intent, intentResponse);
         return false;
       }, false);
 
-      var intentResponse = function (intentData) {
+      var intentResponse = function (data) {
         var output = document.getElementById("output");
-        setText(output, intentData.data[0]);
+        setText(output, data);
         focus();
       };
     }, false);

diff --git a/server/examples/pages/intents/shorten/shorten_action.html b/server/examples/pages/intents/shorten/shorten_action.html
@@ -20,8 +20,8 @@
   <script>
     attachEventListener(window, "load", function() {
       var output = document.getElementById("output");
-      setText(output, intent.data[0]);
-      intent.postResult(["http://kin.ly/A" ]);
+      setText(output, intent.data);
+      intent.postResult("http://kin.ly/A");
     }, false);
   </script>
   {% endblock %}
@@ -33,8 +33,8 @@
   <h3>The code</h3>
   <pre>attachEventListener(window, "load", function() {
 var output = document.getElementById("output");
-setText(output, intent.data[0]);
-intent.postResult(["http://kin.ly/A" ]);
+setText(output, intent.data);
+intent.postResult("http://kin.ly/A");
 }, false);</pre>
   </section>
 {% endblock %}