").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r
-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window);
\ No newline at end of file
diff --git a/src/content/themes/ie8/mtt.js b/src/content/themes/ie8/mtt.js
deleted file mode 100644
index 6fba1ca..0000000
--- a/src/content/themes/ie8/mtt.js
+++ /dev/null
@@ -1,54 +0,0 @@
-if (window !== undefined && window.mytinytodo !== undefined)
-{
- mytinytodo.options.history = false;
-
- mytinytodo.prepareTaskStr = function(item, noteExp) {
- // — = — = —
- var id = item.id;
- var prio = item.prio;
- return '' +
- ''+"\n"+
- ''+"\n"+
- ''+prepareDuedate(item)+
- ''+item.dateInline+'—'+
- ''+item.dateCompletedInline+'
'+"\n"+
- '
'+preparePrio(prio,id)+''+prepareHtml(item.title)+' '+
- (this.curList.id == -1 ? ''+ tabLists.get(item.listId).name +'' : '') + "\n" +
- this.prepareTagsStr(item)+''+item.dateInlineTitle+'
'+
- '
'+
- '
'+prepareHtml(item.note)+'
'+
- '
'+
- '
'+
- "
List is not published.");
}
if(!$listData) {
- die("No such list");
+ die("No list found");
}
+$data = array();
$feedType = _get('feed');
-$sqlWhere = '';
+
if($feedType == 'completed') {
- $listData['_uid_field'] = 'd_completed';
$listData['_feed_descr'] = $lang->get('feed_completed_tasks');
- $sqlWhere = 'AND compl=1';
+ fillData( $data, $listId, 'd_completed', 'AND compl=1' );
}
elseif($feedType == 'modified') {
- $listData['_uid_field'] = 'd_edited';
- $listData['_feed_descr'] = $lang->get('feed_modified_tasks');
+ $listData['_feed_descr'] = $lang->get('feed_modified_tasks');
+ fillData( $data, $listId, 'd_edited', '' );
}
elseif($feedType == 'current') {
- $listData['_uid_field'] = 'd_created';
$listData['_feed_descr'] = $lang->get('feed_new_tasks');
- $sqlWhere = 'AND compl=0';
+ fillData( $data, $listId, 'd_created', 'AND compl=0' );
+}
+elseif($feedType == 'status') {
+ $listData['_feed_descr'] = $lang->get('feed_tasks');
+ fillData( $data, $listId, 'd_created', '' );
+ fillData( $data, $listId, 'd_edited', 'AND compl=0 AND d_edited > d_created' );
+ fillData( $data, $listId, 'd_completed', 'AND compl=1' );
}
else {
- $listData['_uid_field'] = 'd_created';
- $listData['_feed_descr'] = $lang->get('feed_new_tasks');
+ $listData['_feed_descr'] = $lang->get('feed_new_tasks');
+ $feedType = 'tasks';
+ fillData( $data, $listId, 'd_created', '' );
}
$listData['_feed_title'] = sprintf($lang->get('feed_title'), $listData['name']) . ' - '. $listData['_feed_descr'];
+$listData['_feed_link'] = get_mttinfo('mtt_url'). "feed.php?list=". (int)$listData['id'] . ($feedType != '' ? "&feed=". $feedType : '');
+$listData['_feed_type'] = $feedType;
htmlarray_ref($listData);
-$data = array();
-$q = $db->dq("SELECT * FROM {$db->prefix}todolist WHERE list_id=$listId $sqlWhere ORDER BY ". $listData['_uid_field'] ." DESC LIMIT 100");
-while($r = $q->fetch_assoc($q))
+printRss($data, $listData);
+
+
+function fillData(&$data, $listId, $field, $sqlWhere )
{
- if($r['prio'] > 0) $r['prio'] = '+'.$r['prio'];
- $a = array();
- if($r['prio']) $a[] = $lang->get('priority'). ": $r[prio]";
- if($r['duedate'] != '') {
- $ad = explode('-', $r['duedate']);
- $a[] = $lang->get('due'). ": ".formatDate3(Config::get('dateformat'), (int)$ad[0], (int)$ad[1], (int)$ad[2], $lang);
+ $lang = Lang::instance();
+ $db = DBConnection::instance();
+ $q = $db->dq("SELECT * FROM {$db->prefix}todolist WHERE list_id=$listId $sqlWhere ORDER BY $field DESC LIMIT 100");
+ while ($r = $q->fetch_assoc($q))
+ {
+ if ($r['prio'] > 0) {
+ $r['prio'] = '+'.$r['prio'];
+ }
+ $a = array();
+ $a[] = $lang->get('task'). ": ". $r['title'];
+ if ($r['prio']) {
+ $a[] = $lang->get('priority'). ": $r[prio]";
+ }
+ if ($r['duedate'] != '') {
+ $ad = explode('-', $r['duedate']);
+ $a[] = $lang->get('due'). ": ".formatDate3(Config::get('dateformat'), (int)$ad[0], (int)$ad[1], (int)$ad[2], $lang);
+ }
+ if ($r['tags'] != '') {
+ $a[] = $lang->get('tags'). ": ". str_replace(',', ', ', $r['tags']);
+ }
+ if ($r['compl']) {
+ $a[] = $lang->get('taskdate_completed'). ": ". timestampToDatetime($r['d_completed']);
+ }
+ $r['title'] = htmlspecialchars( $r['title'] );
+ $r['note'] = mttMarkup_v1($r['note']);
+ $r['_descr'] = implode("
", htmlarray($a)). "
". $r['note'];
+ $r['_title'] = "#". (int)$r['id']. ": ". $r['title'];
+ $r['_d'] = gmdate('r', $r[$field]);
+ $r['_field'] = $field;
+ $data[] = $r;
}
- if($r['tags'] != '') $a[] = $lang->get('tags'). ": ". str_replace(',', ', ', $r['tags']);
- if($r['compl']) $a[] = $lang->get('taskdate_completed'). ": ". timestampToDatetime($r['d_completed']);
- $r['title'] = strip_tags($r['title']);
- $r['note'] = escapeTags($r['note']);
- $r['_descr'] = nl2br($r['note']). ($a && $r['note']!='' ? "
" : ""). implode("
", htmlarray($a));
- $data[] = $r;
}
-printRss($listData, $data);
-
-
-function printRss($listData, $data)
+function printRss($data, $listData)
{
+ $lang = Lang::instance();
$link = get_mttinfo('url'). "?list=". (int)$listData['id'];
$buildDate = gmdate('r');
- $s = "\n\n\n".
- "$listData[_feed_title]\n$link\n$listData[_feed_descr]\n".
+ $s = "\n".
+ "\n".
+ "\n".
+ "$listData[_feed_title]\n".
+ "$link\n".
+ "\n".
+ "$listData[_feed_descr]\n".
"$buildDate\n\n";
foreach($data as $v)
{
- $d = gmdate('r', $v[$listData['_uid_field']]);
- $guid = $listData['id'].'-'.$v['id'].'-'.$v[$listData['_uid_field']];
+ $guid = $listData['_feed_type']. '-'. $listData['id']. '-'. $v['id']. '-'. $v[$v['_field']];
+ $itemLink = $link. "&task=". (int)$v['id'];
- $s .= "- \n<![CDATA[". str_replace("]]>", "]]]]><![CDATA[>", $v['title']). "]]>\n".
- "$link\n".
- "$d\n".
+ $status = '';
+ if ( $listData['_feed_type'] == 'status' ) {
+ if ( $v['_field'] == 'd_created' ) {
+ $status = $lang->get('feed_status_new');
+ }
+ elseif ( $v['_field'] == 'd_edited' ) {
+ $status = $lang->get('feed_status_updated');
+ }
+ elseif ( $v['_field'] == 'd_completed' ) {
+ $status = $lang->get('feed_status_completed');
+ }
+ }
+ if ( $status !='' ) $status = "[$status] ";
+
+ $s .= "
- \n".
+ "". $status. $v['title']. "\n".
+ "". $itemLink. "\n".
+ "". $v['_d']. "\n".
"\n".
"$guid\n".
- "
\n";
+ " \n\n";
}
$s .= "\n";
diff --git a/src/includes/common.php b/src/includes/common.php
index 9bc2f38..475d997 100644
--- a/src/includes/common.php
+++ b/src/includes/common.php
@@ -115,7 +115,6 @@ class Config
'dateformatshort' => array('default'=>'j M', 'type'=>'s'),
'template' => array('default'=>'default', 'type'=>'s'),
'showdate' => array('default'=>0, 'type'=>'i'),
- 'detectmobile' => array('default'=>1, 'type'=>'i')
);
public static $config;
@@ -216,15 +215,26 @@ function url_dir($url, $onlyPath = 1)
return '/';
}
-function escapeTags($s)
+// Convert note's raw text to html with allowed elements (b,i,u,s and raw urls)
+function mttMarkup_v1($s)
{
+ //hide allowed elements from escaping
$c1 = chr(1);
$c2 = chr(2);
$s = preg_replace("~([\s\S]*?)~i", "${c1}b${c2}\$1${c1}/b${c2}", $s);
$s = preg_replace("~([\s\S]*?)~i", "${c1}i${c2}\$1${c1}/i${c2}", $s);
$s = preg_replace("~([\s\S]*?)~i", "${c1}u${c2}\$1${c1}/u${c2}", $s);
$s = preg_replace("~([\s\S]*?)~i", "${c1}s${c2}\$1${c1}/s${c2}", $s);
- $s = str_replace(array($c1, $c2), array('<','>'), htmlspecialchars($s));
+ $s = htmlspecialchars($s); //escape all elements, except above
+ $s = str_replace( [$c1, $c2], ['<','>'], $s ); //unhide
+ $s = nl2br($s);
+
+ // make links from text starting with 'www.'
+ $s = preg_replace( "/(^|\s|>)(www\.([\w\#$%&~\/.\-\+;:=,\?\[\]@]+?))(,|\.|:|)?(?=\s|"|<|>|\"|<|>|$)/i" , '$1$2$4' , $s );
+
+ // make link from text starting with protocol like 'http://'
+ $s = preg_replace( "/(^|\s|>)([a-z]+:\/\/([\w\#$%&~\/.\-\+;:=,\?\[\]@]+?))(,|\.|:|)?(?=\s|"|<|>|\"|<|>|$)/i" , '$1$2$4' , $s);
+
return $s;
}
diff --git a/src/includes/mytinytodo.js b/src/includes/mytinytodo.js
index 0a9b042..2971d29 100644
--- a/src/includes/mytinytodo.js
+++ b/src/includes/mytinytodo.js
@@ -53,7 +53,6 @@ var mytinytodo = window.mytinytodo = _mtt = {
options: {
title: '',
openList: 0,
- singletab: false,
autotag: false,
instantSearch: true,
tagPreview: true,
@@ -130,6 +129,9 @@ var mytinytodo = window.mytinytodo = _mtt = {
else {
this.homeUrl = this.mttUrl;
}
+ if ( ! options.hasOwnProperty('touchDevice') ) {
+ this.options.touchDevice = ('ontouchend' in document);
+ }
jQuery.extend(this.options, options);
@@ -137,7 +139,6 @@ var mytinytodo = window.mytinytodo = _mtt = {
flag.isLogged = options.isLogged ? true : false;
if(this.options.showdate) $('#page_tasks').addClass('show-inline-date');
- if(this.options.singletab) $('#lists .mtt-tabs').addClass('mtt-tabs-only-one');
// handlers
$('.mtt-tabs-add-button').click(function(){
@@ -145,12 +146,9 @@ var mytinytodo = window.mytinytodo = _mtt = {
});
$('.mtt-tabs-select-button').click(function(event){
- if(event.metaKey || event.ctrlKey) {
- // toggle singetab interface
- _mtt.applySingletab(!_mtt.options.singletab);
- return false;
+ if (!_mtt.menus.selectlist) {
+ _mtt.menus.selectlist = new mttMenu( 'slmenucontainer', { onclick:slmenuSelect, alignRight: true } );
}
- if(!_mtt.menus.selectlist) _mtt.menus.selectlist = new mttMenu('slmenucontainer', {onclick:slmenuSelect, adjustWidth:true, alignRight:true});
_mtt.menus.selectlist.show(this);
});
@@ -241,7 +239,8 @@ var mytinytodo = window.mytinytodo = _mtt = {
$('#tagcloudload').show();
loadTags(curList.id, function(){$('#tagcloudload').hide();});
}
- }, adjustWidth:true, alignRight:true
+ },
+ alignRight:true
});
_mtt.menus.tagcloud.show(this);
});
@@ -277,24 +276,15 @@ var mytinytodo = window.mytinytodo = _mtt = {
// Tabs
- $('#lists').on('click', 'li.mtt-tab', function(event){
+ $('#lists').on('click', 'li.mtt-tab', function(event) {
+ var listId = this.id.split('_', 2)[1];
+ if (listId === 'all') listId = -1;
if(event.metaKey || event.ctrlKey) {
// hide the tab
- var listId = parseInt(this.id.split('_', 2)[1]);
hideList(listId);
return false;
}
- tabSelect(this);
- return false;
- });
-
- $('#list_all').click(function(event){
- if(event.metaKey || event.ctrlKey) {
- // hide the tab
- hideList(-1);
- return false;
- }
- tabSelect(-1);
+ tabSelect(listId);
return false;
});
@@ -303,11 +293,6 @@ var mytinytodo = window.mytinytodo = _mtt = {
return false; //stop bubble to tab click
});
- $('#list_all .list-action').click(function(event){
- listMenu(this);
- return false; //stop bubble to tab click
- });
-
//Priority popup
$('#priopopup .prio-neg-1').click(function(){
prioClick(-1,this);
@@ -481,16 +466,27 @@ var mytinytodo = window.mytinytodo = _mtt = {
}
$("#tasklist").sortable({
- items: '> :not(.task-completed)',
- cancel: 'span,input,a,textarea',
- delay: 150,
- start: tasklistSortStart,
- update: tasklistSortUpdated,
- placeholder: 'mtt-task-placeholder',
- cursor: 'grabbing'
+ items: '> :not(.task-completed)',
+ cancel: 'span,input,a,textarea',
+ delay: 150,
+ start: tasklistSortStart,
+ update: tasklistSortUpdated,
+ placeholder: 'mtt-task-placeholder',
+ cursor: 'grabbing'
});
- if (options.touchDevice) {
+
+ $("#lists ul").sortable({
+ delay: 150,
+ update: listOrderChanged,
+ items: '> :not(.mtt-tabs-alltasks)',
+ forcePlaceholderSize : true,
+ placeholder: 'mtt-tab mtt-tab-sort-placeholder',
+ cursor: 'grabbing'
+ });
+
+
+ if (this.options.touchDevice) {
$("#tasklist").disableSelection();
$("#tasklist").sortable('option', {
axis: 'y',
@@ -499,17 +495,9 @@ var mytinytodo = window.mytinytodo = _mtt = {
distance: 0
});
$('#cmenu_note').hide();
+ $("#lists ul").sortable('disable');
}
- $("#lists ul").sortable({
- delay:150,
- update:listOrderChanged,
- placeholder: 'mtt-list-sort-placeholder',
- cursor: 'grabbing'
- });
-
- this.applySingletab();
-
// AJAX Errors
$(document).ajaxSend(function(r,s){
@@ -676,11 +664,18 @@ var mytinytodo = window.mytinytodo = _mtt = {
// or open first if all list are hidden
if(!openListId) openListId = res.list[0].id;
- $.each(res.list, function(i,item){
- tabLists.add(item);
- ti += ''+
- ''+item.name+''+
- '';
+ $.each(res.list, function(i,item) {
+ if ( item.id == -1) {
+ ti += ''+
+ ''+item.name+''+
+ '';
+ }
+ else {
+ tabLists.add(item);
+ ti += ''+
+ ''+item.name+''+
+ '';
+ }
});
}
@@ -757,20 +752,6 @@ var mytinytodo = window.mytinytodo = _mtt = {
if (this.pages.current.onBack) this.pages.current.onBack.call(this);
},
- applySingletab: function(yesno)
- {
- if(yesno == null) yesno = this.options.singletab;
- else this.options.singletab = yesno;
-
- if(yesno) {
- $('#lists .mtt-tabs').addClass('mtt-tabs-only-one');
- $("#lists ul").sortable('disable');
- }
- else {
- $('#lists .mtt-tabs').removeClass('mtt-tabs-only-one');
- $("#lists ul").sortable('enable');
- }
- },
filter: {
_filters: [],
@@ -975,7 +956,7 @@ function loadTasks(opts)
function prepareTaskStr(item, noteExp)
{
return '' +
+ ((curList.showNotes && item.note != '') || noteExp ? ' task-expanded' : '') + prepareDomClassOfTags(item.tags_ids) + '">
' +
prepareTaskBlocks(item) + "
\n";
};
_mtt.prepareTaskStr = prepareTaskStr;
@@ -994,7 +975,7 @@ function prepareTaskBlocks(item)
'
' +
'
' +
preparePrio(item.prio,id) +
- '' + prepareHtml(item.title) + ' ' +
+ '' + prepareTaskTitleInlineHtml(item.title) + ' ' +
(curList.id == -1 ? ''+ tabLists.get(item.listId).name +'' : '') +
prepareTagsStr(item) +
''+item.dateInlineTitle+'' +
@@ -1003,7 +984,7 @@ function prepareTaskBlocks(item)
'
' +
'
' +
- '
'+prepareHtml(item.note)+'
' +
+ '
' + prepareTaskNoteInlineHtml(item.note) + '
' +
'
'+
'
'+_mtt.lang.get('actionNoteSave') +
' | '+_mtt.lang.get('actionNoteCancel')+'' +
@@ -1015,13 +996,19 @@ function prepareTaskBlocks(item)
};
_mtt.prepareTaskBlocks = prepareTaskBlocks;
-function prepareHtml(s)
+function prepareTaskTitleInlineHtml(s)
{
- // make URLs clickable
- s = s.replace(/(^|\s|>)(www\.([\w\#$%&~\/.\-\+;:=,\?\[\]@]+?))(,|\.|:|)?(?=\s|"|<|>|\"|<|>|$)/gi, '$1
$2$4');
- return s.replace(/(^|\s|>)((?:http|https|ftp):\/\/([\w\#$%&~\/.\-\+;:=,\?\[\]@]+?))(,|\.|:|)?(?=\s|"|<|>|\"|<|>|$)/ig, '$1
$2$4');
+ // Task title is already escaped on php back-end
+ return s;
+}
+_mtt.prepareTaskTitleInlineHtml = prepareTaskTitleInlineHtml;
+
+function prepareTaskNoteInlineHtml(s)
+{
+ // Task note is already escaped on php back-end
+ return s;
};
-_mtt.prepareHtml = prepareHtml;
+_mtt.prepareTaskNoteInlineHtml = prepareTaskNoteInlineHtml;
function preparePrio(prio,id)
{
@@ -1046,7 +1033,7 @@ function prepareTagsStr(item)
};
_mtt.prepareTagsStr = prepareTagsStr;
-function prepareTagsClass(ids)
+function prepareDomClassOfTags(ids)
{
if(!ids || ids == '') return '';
var a = ids.split(',');
@@ -1056,7 +1043,7 @@ function prepareTagsClass(ids)
}
return ' '+a.join(' ');
};
-_mtt.prepareTagsClass = prepareTagsClass;
+_mtt.prepareDomClassOfTags = prepareDomClassOfTags;
function prepareDueDate(item)
{
@@ -1309,12 +1296,13 @@ function toggleAllNotes(show)
function tabSelect(elementOrId)
{
var id;
- if(typeof elementOrId == 'number') id = elementOrId;
+ if (typeof elementOrId == 'number') id = elementOrId;
else if(typeof elementOrId == 'string') id = parseInt(elementOrId);
else {
id = $(elementOrId).attr('id');
- if(!id) return;
- id = parseInt(id.split('_', 2)[1]);
+ if (!id ) return;
+ id = id.split('_', 2)[1];
+ if (id === 'all') id = -1;
}
if ( !tabLists.exists(id) ) {
// TODO: handle unknown list
@@ -1327,7 +1315,6 @@ function tabSelect(elementOrId)
document.title = curList.name + ' - ' + _mtt.options.title;
$('#lists .mtt-tabs-selected').removeClass('mtt-tabs-selected');
- $('#list_all').removeClass('mtt-tabs-selected');
if(id == -1) {
$('#list_all').addClass('mtt-tabs-selected').removeClass('mtt-tabs-hidden');
@@ -1475,7 +1462,7 @@ function saveTaskNote(id)
var item = json.list[0];
taskList[id].note = item.note;
taskList[id].noteText = item.noteText;
- $('#tasknote'+id+'>span').html(prepareHtml(item.note));
+ $('#tasknote'+id).html(prepareTaskNoteInlineHtml(item.note));
if(item.note == '') $('#taskrow_'+id).removeClass('task-has-note task-expanded');
else $('#taskrow_'+id).addClass('task-has-note task-expanded');
cancelTaskNote(id);
@@ -1855,7 +1842,8 @@ function mttMenu(container, options)
}
this.hide();
$(this.caller).removeClass('mtt-menu-button-active');
- $(document).unbind('mousedown.mttmenuclose');
+ $(document).off('mousedown.mttmenu');
+ $(document).off('keydown.mttmenu');
// onClose trigger
if(this.options.onClose && this.options.onClose.call) {
@@ -1870,7 +1858,12 @@ function mttMenu(container, options)
this.close();
if(this.caller && this.caller == caller) return;
}
- $(document).triggerHandler('mousedown.mttmenuclose'); //close any other open menu
+ $(document).triggerHandler('mousedown.mttmenu'); //close any other open menu
+ $(document).on('keydown.mttmenu', function(event) {
+ if (event.keyCode == 27) {
+ menu.close(); //close the menu on Esc pressed
+ }
+ });
this.caller = caller;
var $caller = $(caller);
@@ -1880,11 +1873,15 @@ function mttMenu(container, options)
}
// adjust width
- this.$container.removeClass('mtt-left-adjusted mtt-right-adjusted');
- if ( this.options.adjustWidth && this.$container.outerWidth(true) > $(window).width() ) {
- this.$container.addClass('mtt-left-adjusted mtt-right-adjusted');
- this.$container.width( $(window).width() - (this.$container.outerWidth(true) - this.$container.width()) );
+ if (this.options.adjustWidth) {
+ this.$container.width('');
+ this.$container.removeClass('mtt-left-adjusted mtt-right-adjusted');
+ if ( this.$container.outerWidth(true) > $(window).width() ) {
+ this.$container.addClass('mtt-left-adjusted mtt-right-adjusted');
+ this.$container.width( $(window).width() - (this.$container.outerWidth(true) - this.$container.width()) );
+ }
}
+
//round the width to avoid overflow issues
this.$container.width( Math.ceil(this.$container.width()) );
@@ -1911,18 +1908,25 @@ function mttMenu(container, options)
this.$container.css({ position: 'absolute', top: y, left: x, width:this.$container.width() /*, 'min-width': $caller.width()*/ }).show();
var menu = this;
- $(document).bind('mousedown.mttmenuclose', function(e){ menu.close(e) });
+ $(document).on('mousedown.mttmenu', function(e) { menu.close(e) });
this.isOpen = true;
};
this.showSub = function()
{
// adjust width
- this.$container.removeClass('mtt-left-adjusted mtt-right-adjusted');
- if ( this.options.adjustWidth && this.$container.outerWidth(true) > $(window).width() ) {
- this.$container.addClass('mtt-left-adjusted mtt-right-adjusted');
- this.$container.width( $(window).width() - (this.$container.outerWidth(true) - this.$container.width()) );
+ if (this.options.adjustWidth) {
+ this.$container.width('');
+ this.$container.removeClass('mtt-left-adjusted mtt-right-adjusted');
+ if ( this.$container.outerWidth(true) > $(window).width() ) {
+ this.$container.addClass('mtt-left-adjusted mtt-right-adjusted');
+ this.$container.width( $(window).width() - (this.$container.outerWidth(true) - this.$container.width()) );
+ }
}
+
+ //round the width to avoid overflow issues
+ this.$container.width( Math.ceil(this.$container.width()) );
+
this.$caller.addClass('mtt-menu-item-active');
var offset = this.$caller.offset();
var containerWidth = this.$container.outerWidth(true);
diff --git a/src/index.php b/src/index.php
index e6d9ee2..75e8909 100644
--- a/src/index.php
+++ b/src/index.php
@@ -29,19 +29,6 @@ if (!is_int(Config::get('firstdayofweek')) || Config::get('firstdayofweek')<0 ||
Config::set('firstdayofweek', 1);
}
-if ( !isset($_GET['mobile']) && !isset($_GET['pda']) && !isset($_GET['desktop']) && Config::get('detectmobile') ) {
- if (is_mobile()) {
- Config::set('mobile', 1);
- }
-}
-//TODO: if we have a desktop or mobile theme request we have to save it in cookies and redirect (if auto-detect mobiles is on)
-else if ( isset($_GET['desktop']) ) { //more priority than mobile
- Config::set('mobile', 0);
-}
-else if ( isset($_GET['mobile']) || isset($_GET['pda']) ) {
- Config::set('mobile', 1);
-}
-
define('TEMPLATEPATH', MTTTHEMES. Config::get('template'). '/');
require(TEMPLATEPATH. 'index.php');
@@ -60,17 +47,3 @@ function redirectWithHashRoute(array $q, array $hash)
header("Location: ". $url);
exit;
}
-
-function is_mobile()
-{ //basic detection
- if (preg_match("/(iphone|ipad|android)/i", _server('HTTP_USER_AGENT'))) {
- return true;
- }
- return false;
-}
-
-function getDesktopUrl($escape = true)
-{
- $url = (Config::get('detectmobile') && is_mobile()) ? get_unsafe_mttinfo('desktop_url') : get_unsafe_mttinfo('url');
- return $escape ? htmlspecialchars($url) : $url;
-}
\ No newline at end of file
diff --git a/src/init.php b/src/init.php
index df7869f..9e814ca 100644
--- a/src/init.php
+++ b/src/init.php
@@ -175,15 +175,6 @@ function get_unsafe_mttinfo($v)
$_mttinfo['url'] = ($is_https ? 'https://' : 'http://'). $_SERVER['HTTP_HOST']. url_dir(getRequestUri());
}
return $_mttinfo['url'];
- case 'mobile_url':
- $_mttinfo['mobile_url'] = Config::getUrl('mobile_url');
- if ($_mttinfo['mobile_url'] == '') {
- $_mttinfo['mobile_url'] = get_unsafe_mttinfo('url'). '?mobile';
- }
- return $_mttinfo['mobile_url'];
- case 'desktop_url':
- $_mttinfo['desktop_url'] = get_unsafe_mttinfo('url'). '?desktop';
- return $_mttinfo['desktop_url'];
case 'mtt_url':
/* Directory with ajax.php. No need to set if you use default directory structure. */
$_mttinfo['mtt_url'] = Config::getUrl('mtt_url'); // need to have a trailing slash
diff --git a/version.txt b/version.txt
index 6463e95..7c483e8 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.6.4
\ No newline at end of file
+1.7
\ No newline at end of file