Pingboard.dcproj/project.wdgt/Images/button_help_left.png Pingboard.dcproj/project.wdgt/Images/button_help_left_clicked.png Pingboard.dcproj/project.wdgt/Images/button_help_middle.png Pingboard.dcproj/project.wdgt/Images/button_help_middle_clicked.png Pingboard.dcproj/project.wdgt/Images/button_help_right.png Pingboard.dcproj/project.wdgt/Images/button_help_right_clicked.png Pingboard.dcproj/project.wdgt/Images/button_test_left.png Pingboard.dcproj/project.wdgt/Images/button_test_left_clicked.png Pingboard.dcproj/project.wdgt/Images/button_test_middle.png Pingboard.dcproj/project.wdgt/Images/button_test_middle_clicked.png Pingboard.dcproj/project.wdgt/Images/button_test_right.png Pingboard.dcproj/project.wdgt/Images/button_test_right_clicked.png Pingboard.wdgt/Images/button_help_left.png Pingboard.wdgt/Images/button_help_left_clicked.png Pingboard.wdgt/Images/button_help_middle.png Pingboard.wdgt/Images/button_help_middle_clicked.png Pingboard.wdgt/Images/button_help_right.png Pingboard.wdgt/Images/button_help_right_clicked.png Pingboard.wdgt/Images/button_test_left.png Pingboard.wdgt/Images/button_test_left_clicked.png Pingboard.wdgt/Images/button_test_middle.png Pingboard.wdgt/Images/button_test_middle_clicked.png Pingboard.wdgt/Images/button_test_right.png Pingboard.wdgt/Images/button_test_right_clicked.png @@ -45,16 +45,16 @@ <real>0.0</real> <key>sizes</key> <array> - <string>{{0, 0}, {1302, 257}}</string> - <string>{{0, 267}, {1302, 627}}</string> + <string>{{0, 0}, {846, 444}}</string> + <string>{{0, 454}, {846, 254}}</string> </array> </dict> <key>ContentViewType</key> - <integer>0</integer> + <integer>5</integer> <key>Dashboard Widget Prefs</key> <dict> <key>id</key> - <string>f5ba8d4500b7ac41</string> + <string>7902691d01b7ac41</string> <key>in-layer</key> <true/> <key>path</key> @@ -64,15 +64,15 @@ <key>percent-offset-y</key> <integer>0</integer> <key>percent-type</key> - <integer>3</integer> + <integer>4</integer> <key>percent-x</key> - <real>0.081874996423721313</real> + <real>0.32249999046325684</real> <key>percent-y</key> - <real>0.078333333134651184</real> + <real>0.0099999997764825821</real> <key>pos-x</key> - <integer>979</integer> + <integer>516</integer> <key>pos-y</key> - <integer>612</integer> + <integer>694</integer> <key>rosetta</key> <false/> </dict> @@ -99,12 +99,12 @@ <real>0.0</real> <key>sizes</key> <array> - <string>{{0, 0}, {244, 915}}</string> - <string>{{245, 0}, {1303, 915}}</string> + <string>{{0, 0}, {244, 729}}</string> + <string>{{245, 0}, {847, 729}}</string> </array> </dict> <key>MainWindowFrame</key> - <string>34 239 1547 936 0 0 1600 1178 </string> + <string>135 361 1091 750 0 0 1600 1178 </string> <key>NavigatorSplitViewGeometry</key> <dict> <key>ContentSplitViewConfig</key> @@ -119,8 +119,8 @@ <real>0.0</real> <key>sizes</key> <array> - <string>{{0, 0}, {246, 400}}</string> - <string>{{0, 410}, {246, 484}}</string> + <string>{{0, 0}, {246, 316}}</string> + <string>{{0, 326}, {246, 382}}</string> </array> </dict> <key>Objects view expanded items</key> @@ -208,7 +208,11 @@ </array> </array> <key>Objects view last selections</key> - <array/> + <array> + <array> + <integer>5</integer> + </array> + </array> <key>Opened Steps</key> <array> <integer>0</integer> @@ -220,7 +224,7 @@ </array> <key>Visible StackLayout Views</key> <array> - <string>front</string> + <string>back</string> <string>error_view</string> </array> </dict> Pingboard.dcproj/robertsanders.wdgtuser Pingboard.wdgt/Default.png @@ -13,9 +13,9 @@ <key>CFBundleName</key> <string>Pingboard</string> <key>CFBundleShortVersionString</key> - <string>0.4.3</string> + <string>0.5</string> <key>CFBundleVersion</key> - <string>0.4.3</string> + <string>0.5</string> <key>CloseBoxInsetX</key> <integer>15</integer> <key>CloseBoxInsetY</key> Pingboard.wdgt/Info.plist @@ -9,7 +9,8 @@ var dashcodePartSpecs = { "ApiKeyTitle": { "creationFunction": "CreateText", "text": "GET YOUR KEY" }, "button": { "creationFunction": "CreateButton", "leftImageWidth": 5, "onclick": "showFront", "rightImageWidth": 5, "text": "Done" }, "button_getKey": { "creationFunction": "CreateButton", "leftImageWidth": 5, "onclick": "openAppKeyPage", "rightImageWidth": 5, "text": "Get Key" }, - "button_getKey1": { "creationFunction": "CreateButton", "leftImageWidth": 5, "onclick": "validateUser", "rightImageWidth": 5, "text": "Test" }, + "button_help": { "creationFunction": "CreateButton", "leftImageWidth": 5, "onclick": "openHelp", "rightImageWidth": 5, "text": "Help" }, + "button_test": { "creationFunction": "CreateButton", "leftImageWidth": 5, "onclick": "validateUser", "rightImageWidth": 5, "text": "Test" }, "character_count": { "creationFunction": "CreateText", "text": "0" }, "done": { "creationFunction": "CreateGlassButton", "onclick": "configDone", "text": "Done" }, "history_button": { "creationFunction": "CreateButton", "leftImageWidth": 5, "onclick": "showLatestPosts", "rightImageWidth": 5 }, @@ -24,5 +25,5 @@ var dashcodePartSpecs = { "text": { "creationFunction": "CreateText", "text": "Error!" }, "text2": { "creationFunction": "CreateText", "text": "/ 140" }, "title": { "creationFunction": "CreateText", "text": "Pingboard" }, - "version": { "creationFunction": "CreateText" } + "version": { "creationFunction": "CreateText", "text": "Ver x.y" } }; Pingboard.wdgt/Parts/setup.js @@ -10,7 +10,11 @@ * Version: 0.3.1 */ -var pingfm = { +var PingFMAPI = function(api_key) { + this.api_key = api_key; +}; + +PingFMAPI.prototype = { // the base URL for the Ping.FM API baseurl: "http://api.ping.fm/v1/", @@ -32,7 +36,11 @@ var pingfm = { // should be a view object with showError, showResult, showNotice, log view: null, - // services information + // system services information + system_servicexml: null, + system_serviceinfo: [], + + // user services information servicexml: null, serviceinfo: [], @@ -49,6 +57,20 @@ var pingfm = { // wait this many milliseconds between user.post and user.latest - fixes race in ping.fm's API post_post_delay: 6000, + proxy_rewriter: null, + + initialize: function() { + this.downloadServiceData(); + }, + + downloadServiceData: function() { + this.log("downloading initial system data..."); + this.getSystemServices(function(data) { + this.serviceinfo = data; + } + ); + }, + getBaseArgs: function() { return { api_key: this.api_key, @@ -100,12 +122,17 @@ var pingfm = { } }, - postMessage: function(body, method, title, success, failure) { + postMessage: function(body, method, title, success, failure, exclude) { var args = this.getBaseArgs(); args.body = body; // default if (! method) method = this.post_method; + + // list of services to exclude + if (exclude && exclude.length > 0) { + args.exclude = exclude.join(","); + } // default posting API call; use user.tpost for custom triggers var apimethod = 'user.post'; @@ -170,9 +197,11 @@ var pingfm = { }, log: function(msg) { - if (this.view && this.view.log) this.view.log(msg); - if (this.debug) + if (this.view && this.view.log) { + this.view.log(msg); + } else if (this.debug) { console.log(msg); + } }, showError: function(error) { @@ -437,6 +466,82 @@ var pingfm = { } }, + /** + <rsp status="OK"> + <transaction>48a87626afa41</transaction> + <method>system.services</method> + <services> + <service id="bebo" name="Bebo"> + <trigger>@be</trigger> + <url>http://www.bebo.com/</url> + <icon>http://p.ping.fm/static/icons/bebo.png</icon> + </service> + <service id="blogger" name="Blogger"> + <trigger>@bl</trigger> + <url>http://www.blogger.com/</url> + <icon>http://p.ping.fm/static/icons/blogger.png</icon> + </service> + </services> + </rsp> + */ + /* + + var obj = { name: elt[0], id: elt[1], trigger: elt[2], + service_url: elt[3], icon_url: elt[4] }; + } + */ + + _parseSystemServices: function(list) { + var services = []; + jQuery('service', list).each(function(i) { + var id = jQuery(this).attr('id'); + var name = jQuery(this).attr('name'); + var trigger = jQuery('trigger', this).text(); + var icon_url = jQuery('icon', this).text(); + var service_url = jQuery('url', this).text(); + + // in current API, 'methods' is not provided for system svcs + var methods = []; + var methodtext = jQuery('methods', this).text(); + if (methodtext && methodtext.length > 0) { + methods = methodtext.split(','); + } + services[id] = { id: id, name: name, methods: methods, + trigger: trigger, icon_url: icon_url, + service_url: service_url + }; + } ); + return services; + }, + + getSystemServices: function(success, failure) { + var args = this.getBaseArgs(); + + var me = this; + this.doRequest('system.services', args, + function(data) { + me.system_servicexml = data; + var system_serviceinfo = []; + if (data) { + system_serviceinfo = me._parseSystemServices(jQuery('services', data)); + } + me.system_serviceinfo = system_serviceinfo; + me.log("Success on system.services"); + if (success) { + success( system_serviceinfo ); + } + }, + function(data, error) { + me.log("Failure on system.services"); + if (failure) { + failure(data, error); + } + } + ); + }, + + /************************** plumbing ********************************/ + doRequest: function(method, args, success, failure, httpmethod, usequeue) { if (! httpmethod) { httpmethod = 'post'; @@ -450,15 +555,22 @@ var pingfm = { } var me = this; - var request = jQuery.ajax({ - url: me.baseurl + method, + var url = me.baseurl + method; + var ajaxargs = { + url: url, type: httpmethod, data: args, global: true, cache: me.allowCache, success: this._makejQuerySuccessHandler(success, failure), error: this._makejQueryFailureHandler(failure) - }); + }; + + if (this.proxy_rewriter) { + ajaxargs = this.proxy_rewriter(ajaxargs); + } + + var request = ajax(ajaxargs); }, /**** Utility functions ****/ @@ -504,7 +616,13 @@ var pingfm = { * return all services supported by Ping.fm as of 8/2008 */ configSupportedServices: function() { - // display_name, api_name, trigger, service_url, icon_url, capability_string + + if (this.system_serviceinfo) { + // this.log("configSupportedServices using system_serviceinfo"); + return this.system_serviceinfo; + } + + // name, id, trigger, service_url, icon_url, capability_string // in capability_string: 'b' for blog, 'm' for micro, 's' for status - this is UNRELIABLE var list = [ ['Bebo', 'bebo', '@be', 'http://www.Bebo.com', 'svcicons/bebo.png', 'bs'], @@ -535,10 +653,10 @@ var pingfm = { var idx; for (idx = 0; idx < list.length; idx++) { var elt = list[idx]; - var obj = { display_name: elt[0], api_name: elt[1], trigger: elt[2], + var obj = { name: elt[0], id: elt[1], trigger: elt[2], service_url: elt[3], icon_url: elt[4] }; - services[obj.api_name] = obj; + services[obj.id] = obj; } return services; @@ -549,9 +667,17 @@ var pingfm = { * or any other property name */ getSupportedService: function(value, property) { - if (!property) property = 'api_name'; + if (!property) property = 'id'; var idx; - var supported = this.configSupportedServices(); + var supported; + + if (this.system_serviceinfo && value.toLowerCase() != 'custom') { + // console.log("using system.services output"); + supported = this.system_serviceinfo; + } else { + supported = this.configSupportedServices(); + } + for (idx in supported) { var elt = supported[idx]; if (typeof elt == 'function') continue; @@ -562,5 +688,11 @@ var pingfm = { return null; }, - version: '0.4.3' + version: '0.5' +}; + +PingFMAPI.prototype.FlexProxyRewriter = function(ajaxargs) { + ajaxargs.url = url.replace(/^https?:\/\//, "http://flexproxy.eng.vitrue.com/"); + + return ajaxargs; }; Pingboard.wdgt/lib/pingfm.js @@ -36,7 +36,6 @@ body { } /* std apple stuff */ - #frontImg { position: absolute; display: block; @@ -140,9 +139,9 @@ body { right: auto; margin-top: 0px; width: 81px; - left: 358px; - top: 47px; height: 24px; + left: 358px; + top: 59px; } #ApiKeyTitle { @@ -189,19 +188,6 @@ body { opacity: 1; } -#button_getKey1 { - font-family: HelveticaNeue-Bold; - font-size: 12px; - text-align: center; - position: absolute; - right: auto; - margin-top: 0px; - left: 29px; - width: 61px; - top: 180px; - height: 24px; -} - #back_test_output { color: black; font-family: HelveticaNeue; @@ -224,9 +210,9 @@ body { right: auto; bottom: auto; margin-top: 0px; - top: 126px; - left: 372px; width: 67px; + left: 311px; + top: 126px; } #debug_text { @@ -388,8 +374,8 @@ body { font-family: HelveticaNeue; font-size: 10pt; left: 110px; - width: 236px; top: 121px; + width: 164px; } #name_display { @@ -510,3 +496,29 @@ body { width: 225px; left: 244px; } + +#button_test { + font-family: HelveticaNeue-Bold; + font-size: 12px; + text-align: center; + position: absolute; + right: auto; + margin-top: 0px; + left: 29px; + width: 61px; + top: 180px; + height: 24px; +} + +#button_help { + font-family: HelveticaNeue-Bold; + font-size: 12px; + text-align: center; + position: absolute; + right: auto; + margin-top: 0px; + height: 24px; + width: 50px; + left: 415px; + top: 126px; +} Pingboard.wdgt/main.css @@ -60,9 +60,10 @@ </div> <div id="ApiKeyTitle" onclick="openPingFM(event)"></div> <div id="button_getKey"></div> - <div id="button_getKey1"></div> + <div id="button_test"></div> <textarea id="back_test_output" disabled="disabled"></textarea> <div id="version"></div> + <div id="button_help"></div> </div> <div id="error_pane"> <img id="errorImg1" src="Images/front%201.png" alt=""> Pingboard.wdgt/main.html @@ -14,6 +14,8 @@ function load() pingview.hideScrolldown(); + pingfm = new PingFMAPI(); + setupPingFM(); setupUI(); @@ -272,6 +274,8 @@ function setupPingFM() pingfm.debug = pingprefs.getPref('debug', false) ? '1' : '0'; pingfm.view = pingview; + + pingfm.initialize(); } @@ -282,10 +286,17 @@ function doPost(event) var method = pingview.getPostMethod(); var body = jQuery('#post_text').val(); + exclude = pingview.getExcludes(); + if (jQuery('#svciconbox img').length > 0 && jQuery('#svciconbox img').length <= exclude.length) { + pingview.showError("At least one service must be enabled to post!"); + return false; + } + // keep history - pingdb.addPing(body, method); + pingdb.addPing(body, method, {title:'', exclude: exclude}); - pingfm.postMessage(body, method); + // body, method, title, success, failure, excludes + pingfm.postMessage(body, method, null, null, null, exclude); pingview.resetPost(); } @@ -305,7 +316,8 @@ function setPostType(event) // change default pingfm.post_method = type; - + pingview.setExcludes([]); + pingview.showPostTypeIcons(type); // store for later @@ -316,6 +328,8 @@ var pingview = { historyNum: -1, draftping: null, + + excludes: new Object(), // for use by pingfm @@ -353,6 +367,8 @@ var pingview = { if (num == this.historyNum) return; + var me = this; + // save draft if (this.historyNum == -1 && ! suppressDraft) { this.saveDraftPing(); @@ -367,7 +383,7 @@ var pingview = { if (this.draftping) ping = this.draftping; else - ping = {message:''}; + ping = {message:'', excludes:[]}; showNum = ''; } else { @@ -377,11 +393,15 @@ var pingview = { this.historyNum = num; + if (ping) { this.setPostBody(ping.message); if (ping.destination) { this.setPostMethod(ping.destination); } + if (ping.exclude) { + this.setExcludes(ping.exclude); + } jQuery('#historyNum').text(showNum); } }, @@ -410,7 +430,8 @@ var pingview = { var ping = { message: this.getPostBody(), destination: this.getPostMethod(), - when: new Date() + when: new Date(), + exclude: this.getExcludes() }; this.draftping = ping; @@ -493,9 +514,9 @@ var pingview = { }, _makeQuotable: function(str) { - return str.replace(/(["'])/g, '\\$1'); + return str.replace(/([\"\'])/g, '\\$1'); - // ' unconfuse dashcode + // ' unconfuse dashcode }, openServicePage: function(event) { @@ -516,9 +537,17 @@ var pingview = { if (! attributes.title) attributes.title = service.name; if (! attributes.alt) attributes.alt = service.id; - attributes.src = "svcicons/" + service.id + ".png"; + system_service = pingfm.getSupportedService(service.id); + if (system_service) { + // console.log("using system service info for " + service.id); + attributes.src = system_service.icon_url; + } else { + attributes.src = "svcicons/" + service.id + ".png"; + } + attributes.serviceid = service.id; - attributes.onclick = "pingview.openServicePage(event);"; + if (! attributes.onclick && false) + attributes.onclick = "pingview.openServicePage(event);"; var html = '<img class="svcicon" '; for (name in attributes) @@ -554,6 +583,56 @@ var pingview = { } pingview.setServiceIcons('#svciconbox', services); + jQuery('#svciconbox img').unbind('click'). + each(function(item) { this.title = this.title + " - click to toggle"; }). + bind('click', function(event) { pingview.toggleExclude(event); }); + var idx; + for (idx = 0; idx < this.getExcludes().length; idx++) { + + } + }, + + getExcludes: function() { + var id; + var res = []; + for (id in this.excludes) { + var val = this.excludes[id]; + if (typeof val == 'function') continue; + if (val == true) res.push(id); + } + return res; + }, + + setExcludes: function(excludes) { + jQuery('#svciconbox img').css('opacity', 1.0); + this.excludes = {}; + var idx; + for (idx = 0; idx < excludes.length; idx++) { + this.setExcluded(excludes[idx], true); + } + }, + + isExcluded: function(id) { + return this.excludes[id]; + }, + + setExcluded: function(id, value) { + this.excludes[id] = value; + + if (!value) { + opacity = 1.0; + } else { + opacity = 0.2; + } + jQuery('#svciconbox [alt='+id+']').css('opacity', opacity); + }, + + toggleExclude: function(event, val) { + var id = event.target.alt; + + // XXX - this doesn't work if invoked directly as an event handler + // so wrap inside a lambda + this.setExcluded(id, ! this.isExcluded(id)); }, setServiceIcons: function(destination, services) { @@ -619,7 +698,7 @@ var pingview = { this.hideScrolldown(); }, - version: '0.4.3', + version: '0.5', }; /** @@ -648,9 +727,18 @@ var pingdb = { this.db = []; }, - addPing: function(message, destination) { + addPing: function(message, destination, other) { if (! destination) { destination = 'default' }; - this.db.unshift( {message: message, destination: destination, when: new Date()} ); + if (! other) other = {}; + + var item = {message: message, destination: destination, when: new Date()}; + var key; + for (key in other) { + var val = other[key]; + if (typeof val == 'function' || item.hasOwnProperty(key)) continue; + item[key] = val; + } + this.db.unshift( item ); }, listPings: function(count) { @@ -669,7 +757,7 @@ var pingdb = { return this.db.length; }, - version: '0.4.3' + version: '0.5' } function doDebugClick(event) @@ -788,4 +876,9 @@ function showLatestPosts(event) function hideScrolldown(event) { pingview.hideScrolldown(); -} \ No newline at end of file +} + +function openHelp(event) +{ + widget.openURL("http://code.google.com/p/pingboard/wiki/Help"); +} Pingboard.wdgt/main.js Pingboard.dcproj/project.wdgt/Images/button_getKey1_left.png Pingboard.dcproj/project.wdgt/Images/button_getKey1_left_clicked.png Pingboard.dcproj/project.wdgt/Images/button_getKey1_middle.png Pingboard.dcproj/project.wdgt/Images/button_getKey1_middle_clicked.png Pingboard.dcproj/project.wdgt/Images/button_getKey1_right.png Pingboard.dcproj/project.wdgt/Images/button_getKey1_right_clicked.png Pingboard.wdgt/Images/button_getKey1_left.png Pingboard.wdgt/Images/button_getKey1_left_clicked.png Pingboard.wdgt/Images/button_getKey1_middle.png Pingboard.wdgt/Images/button_getKey1_middle_clicked.png Pingboard.wdgt/Images/button_getKey1_right.png Pingboard.wdgt/Images/button_getKey1_right_clicked.png 39a63e6697d2950997cfa1dba840954cc0733c58 Robert Sanders robert@vitrue.com http://github.com/rsanders/pingboard/commit/5ee3ebd5fa7eec3d9f4c36d393c4fd946329e609 5ee3ebd5fa7eec3d9f4c36d393c4fd946329e609 2008-08-19T15:45:43-07:00 2008-08-19T15:45:43-07:00 created 0.5 release a6ed3f5acd6f368b6a8a4359f13b89fac24b0fff Robert Sanders robert@vitrue.com