latest

premasagar · May 8, 2010 · d0c1931 · d0c1931
1 parent 280fbfd
commit d0c1931
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 21 deletions.
diff --git a/api-experiments/widget.html b/api-experiments/widget.html
@@ -3,29 +3,37 @@
 <head>
     <title>My First Sqwidget</title>
     <script>
-(function(){
-    if (!sqwidget){
-        return false;
-    }
-
     // register the widget
     // based on seedjs: http://seedjs.org/documentation/#defining_your_packagejson
-    sqwidget.register({
+	// Sqwidget exists when this is read
+    Sqwidget.register({
       "name": "mysqwidget",
       "version": "0.1.0",
       "title": "My widget does stuff",
       "desc": "Lorem ipsum",
       "url": "http://example.com/widget", // get the widget, via your taskbar
 
+	// require.js or simpler
+	// settings for automatic or explicit exact versions
+	// TODO template is a dependency
+	// default dependencies for the template etc
       "dependencies": {
-        "nitelite": "1.3.0",
+        "nitelite": "1.3.1",
         "appleofmyiframe": "0.3.3",
         "cleanslate": "6.1.8"
       }
     });
-}());
+
+	//TODO controller script
+	<script type="text/javascript" charset="utf-8">
+		//controller
+	</script>
+
     </script>
 
+	<style></style>
+	<link rel=stylesheet>
+
     <script type="text/template" id="lightbox">
         <p>Look closer</p>
     </script>

diff --git a/embed.html b/embed.html
@@ -8,7 +8,8 @@
 <body>
     <h1>Sqwidget demo</h1>
 
-    <script src=sqwidget.js>
+    <script src="sqwidget.js"></script>
+	<script type="text/javascript" charset="utf-8">
         Sqwidget('widget.html', {foo:'bar'}, ['100%', 618], 0.1);
 
         /*

diff --git a/plugins/twitter_processor.js b/plugins/twitter_processor.js
@@ -45,7 +45,7 @@
             var
                 i,r,
                 text;
-                
+            _('got twitter message', results);
             if (results) {
                 for (i=0; i<results.length; i+=1 ){
                     r = results[i];

diff --git a/plugins/twitter_stream.js b/plugins/twitter_stream.js
@@ -16,7 +16,7 @@
             config = {
                 limit: 3
             },
-            searchTerm = '',
+            searchTerm = '';
             twitterlib = widget.plugins.twitterlib;
 
         _('twitter_stream called');
@@ -26,10 +26,10 @@
         /**
          * Search the Twitter API
          */
-        self.search = function(q, callback, limit) {
+        self.search = function(q, callback, l) {
             var
                 count = 0,
-                limit = limit || config.limit;
+                limit = l || config.limit;
 
             searchTerm = (q ? encodeURIComponent(q) : searchTerm);
             twitterlib.search(searchTerm, { limit: limit }, callback);

diff --git a/plugins/twitterlib.js b/plugins/twitterlib.js
@@ -517,6 +517,6 @@
 
 Sqwidget.plugin('twitterlib', function(){
     return twitterlib;
-}, '0.1.0');
+}, '0.1.0', ['jquery']);
 
 }());
diff --git a/samples/dasher/tweet_display.html b/samples/dasher/tweet_display.html
@@ -24,6 +24,7 @@
 		    jQuery('p',container).html('Messages received by ' + container.id + ' listening to stream ' + stream);
 		    // append messages received
 		    plugins.messaging.listen(stream, function(event,stuff) {
+		        alert('got tweets');
 		        jQuery(".message_list", container).append('<li>got msg ' + stuff.text + ' from ' + stuff.from + '</li>' );
 		    });
 		    // send a message to topic
@@ -35,8 +36,8 @@
 </head>
 
 <body>
-    <p>Messages received:</p>
+    <p></p>
-    <ul class="message_list">        
+    <ul class="tweet_list">        
     </ul>
 </body>
 </html>
diff --git a/sqwidget.js b/sqwidget.js
@@ -1252,6 +1252,10 @@ var ready = (function(){
             template.config(dict);
         };
 
+        self.getContainer = function(dict) {
+            return container;
+        };
+
         self.onTemplateLoaded= function() {
             self.runController(template.getScripts());    
             template.loadDependencies(self);  
@@ -1262,7 +1266,7 @@ var ready = (function(){
             //TODO check all plugins loaded
             if (allPluginsLoaded()) {
                 if (!readyRun) {
-                    readyRun=true;
+                    readyRun = true;
                     if (readyFn) {
                         var widget=self;
                         _('running ready() for widget ' + container.id);
@@ -1276,6 +1280,23 @@ var ready = (function(){
             }
         };
 
+        self.checkRun = function() {
+            if (allPluginsLoaded()) {
+                if (!readyRun) {
+                    readyRun=true;
+                    if (readyFn) {
+                        var widget=self;
+                        _('running ready() for widget ' + container.id);
+                        readyFn.call(self);
+                    }
+                    else {
+                        //TODO decide what extra contents will be displayed here
+                        self.setTemplate('default', null, {});
+                    }
+                }
+            }            
+        };
+
         //TODO fit this into the proper place
         ui = {
             head: function(content) {
@@ -1301,7 +1322,15 @@ var ready = (function(){
 
         self.error = function(fn) {
             errorFn = fn;
-        }
+        };
+
+        self.getReadyFn = function() {
+            return readyFn;
+        };
+
+        self.callReady = function() {
+            return readyFn.call(self);
+        };
 
         /*
         // set the ui engine
@@ -1488,9 +1517,12 @@ Sqwidget.ready(function() {
         jQuery.each(widgets, function(w,widget) {
             //_('init for w: ' + widgets[w].toString());
             widget.init();
-        });
+        }); 
-
+
-
+  //      jQuery.each(widgets, function(w,widget) {
+    //        //_('init for w: ' + widgets[w].toString());
+      //      widget.checkRun();
+//        });     
     }
 });