Author: boutell
Date: 2010-02-02 17:09:53 +0100 (Tue, 02 Feb 2010)
New Revision: 27427
Added:
plugins/sfDoctrineActAsTaggablePlugin/trunk/package.xml.tmpl
Removed:
plugins/sfDoctrineActAsTaggablePlugin/trunk/package.xml.tmpl
Modified:
plugins/sfDoctrineActAsTaggablePlugin/trunk/README
plugins/sfDoctrineActAsTaggablePlugin/trunk/lib/TaggableTemplate.class.php
plugins/sfDoctrineActAsTaggablePlugin/trunk/modules/taggableComplete/actions/actions.class.php
plugins/sfDoctrineActAsTaggablePlugin/trunk/modules/taggableComplete/templates/completeSuccess.php
plugins/sfDoctrineActAsTaggablePlugin/trunk/web/js/pkTagahead.js
Log:
more changes from punkave
Modified: plugins/sfDoctrineActAsTaggablePlugin/trunk/README
===================================================================
--- plugins/sfDoctrineActAsTaggablePlugin/trunk/README 2010-02-02 16:06:53 UTC
(rev 27426)
+++ plugins/sfDoctrineActAsTaggablePlugin/trunk/README 2010-02-02 16:09:53 UTC
(rev 27427)
@@ -387,7 +387,6 @@
The `application`, `env`, and `connection` options are also supported.
->>>>>>> .merge-right.r27425
## Plugin internals ##
The plugin associates a parameterHolder to Propel objects, with 3 disjoin
namespaces:
Modified:
plugins/sfDoctrineActAsTaggablePlugin/trunk/lib/TaggableTemplate.class.php
===================================================================
--- plugins/sfDoctrineActAsTaggablePlugin/trunk/lib/TaggableTemplate.class.php
2010-02-02 16:06:53 UTC (rev 27426)
+++ plugins/sfDoctrineActAsTaggablePlugin/trunk/lib/TaggableTemplate.class.php
2010-02-02 16:09:53 UTC (rev 27427)
@@ -309,7 +309,7 @@
->addWhere('tg.taggable_model = ?',
get_class($this->getInvoker()))
;
- $saved_tags = $q->fetchArray();
+ $saved_tags = $q->execute(array(), Doctrine::HYDRATE_ARRAY);
$tags = array();
foreach ($saved_tags as $key => $infos)
Modified:
plugins/sfDoctrineActAsTaggablePlugin/trunk/modules/taggableComplete/actions/actions.class.php
===================================================================
---
plugins/sfDoctrineActAsTaggablePlugin/trunk/modules/taggableComplete/actions/actions.class.php
2010-02-02 16:06:53 UTC (rev 27426)
+++
plugins/sfDoctrineActAsTaggablePlugin/trunk/modules/taggableComplete/actions/actions.class.php
2010-02-02 16:09:53 UTC (rev 27427)
@@ -63,7 +63,14 @@
if (isset($presentOrSuggested[$tag->getName()])) {
continue;
}
- $suggestion['left'] = str_replace(' ', ' ', $all);
+ // At least some browsers actually submitted the
+ // nonbreaking spaces as ordinals distinct from regular spaces,
+ // producing distinct tags. So leave the spaces alone.
+
+ // Also, we no longer display 'left' visibly anyway because
+ // that was never compatible with a list of tags that required
scrolling
+
+ $suggestion['left'] = $all;
$suggestion['suggested'] = $tag->getName();
$presentOrSuggested[$tag->getName()] = true;
$suggestion['right'] =
Modified:
plugins/sfDoctrineActAsTaggablePlugin/trunk/modules/taggableComplete/templates/completeSuccess.php
===================================================================
---
plugins/sfDoctrineActAsTaggablePlugin/trunk/modules/taggableComplete/templates/completeSuccess.php
2010-02-02 16:06:53 UTC (rev 27426)
+++
plugins/sfDoctrineActAsTaggablePlugin/trunk/modules/taggableComplete/templates/completeSuccess.php
2010-02-02 16:09:53 UTC (rev 27427)
@@ -1,6 +1,6 @@
<ul>
-<?php foreach($tagSuggestions as $suggestion): ?>
+<?php $n = 1; $limit = count($tagSuggestions); foreach($tagSuggestions as
$suggestion): ?>
<?php // No extraneous whitespace here, it shows up in text() ?>
-<li><?php echo $suggestion['left']?><a href="#"><?php echo
$suggestion['suggested']?></a><?php echo $suggestion['right']?></li>
-<?php endforeach ?>
-</ul>
+<li><span class="tag-spacer left"><?php echo $suggestion['left']?></span><a
<?php echo ($n == $limit)? 'class="last"':'' ?><?php echo ($n == 1)?
'class="first"':'' ?> href="#"><?php echo $suggestion['suggested']?></a><span
class="tag-spacer left"><?php echo $suggestion['right']?></span></li>
+<?php $n++; endforeach ?>
+</ul>
\ No newline at end of file
Deleted: plugins/sfDoctrineActAsTaggablePlugin/trunk/package.xml.tmpl
===================================================================
--- plugins/sfDoctrineActAsTaggablePlugin/trunk/package.xml.tmpl
2010-02-02 16:06:53 UTC (rev 27426)
+++ plugins/sfDoctrineActAsTaggablePlugin/trunk/package.xml.tmpl
2010-02-02 16:09:53 UTC (rev 27427)
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0";
xmlns:tasks="http://pear.php.net/dtd/tasks-1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; packagerversion="1.4.1"
version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0
http://pear.php.net/dtd/package-2.0.xsd";>
- <name>sfDoctrineActAsTaggablePlugin</name>
- <channel>pear.symfony-project.com</channel>
- <summary>This behavior allows tags to be attached to Doctrine
objects.</summary>
- <description>This behavior allows tags to be attached to Doctrine objects.
It includes tag-cloud generation and helpers to display these clouds. It also
offers optional typeahead features for entering tags.
- </description>
- <lead>
- <name>Mickael Kurmann</name>
- <user>Mickael.Kurmann</user>
- <email>[email protected]</email>
- <active>yes</active>
- </lead>
- <lead>
- <name>Klemens Ullmann</name>
- <user>klemens-ullmann</user>
- <email>[email protected]</email>
- <active>yes</active>
- </lead>
- <lead>
- <name>Thomas Boutell</name>
- <user>boutell</user>
- <email>[email protected]</email>
- <active>yes</active>
- </lead>
- <developer>
- <name>Alex Gilbert</name>
- <user>alex-gilbert</user>
- <email>[email protected]</email>
- <active>yes</active>
- </developer>
- <date>##CURRENT_DATE##</date>
- <version>
- <release>##PLUGIN_VERSION##</release>
- <api>##API_VERSION##</api>
- </version>
- <stability>
- <release>##STABILITY##</release>
- <api>##STABILITY##</api>
- </stability>
- <license uri="http://www.symfony-project.org/license";>MIT license</license>
- <notes>-</notes>
- <contents>
- ##CONTENTS##
- </contents>
- <dependencies>
- <required>
- <php>
- <min>5.2.4</min>
- </php>
- <pearinstaller>
- <min>1.4.1</min>
- </pearinstaller>
- <package>
- <name>symfony</name>
- <channel>pear.symfony-project.com</channel>
- <min>1.2.0</min>
- <max>1.3.0</max>
- <exclude>1.3.0</exclude>
- </package>
- </required>
- </dependencies>
- <phprelease></phprelease>
- <changelog>
- <release>
- <version>
- <release>0.0.7</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.com/license";>MIT
license</license>
- <date>2009-06-09</date>
- <license>MIT</license>
- <notes>
- Addressing a packaging problem. No functional changes
- </notes>
- </release>
- <release>
- <version>
- <release>0.0.5</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.com/license";>MIT
license</license>
- <date>2009-04-19</date>
- <license>MIT</license>
- <notes>
- * Tag typeahead feature. Optional, based on jQuery (boutell)
- * getObjectTaggedWithQuery correctly returns nothing rather than
everything when there are no matching objects (agilbert)
- * Removing tags works properly (boutell, agilbert)
- * getAllTagName lets you pass a query without setting select() and
from() yourself (but you can if you want to) (boutell, agilbert)
- * Fixed Doctrine INDEXBY error
- </notes>
- </release>
- <release>
- <version>
- <release>0.0.4</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.com/license";>MIT
license</license>
- <date>2009-03-08</date>
- <license>MIT</license>
- <notes>
- * (klemens_u) PluginTagTable::getAllTagNameWithCount: Set the
"from" query part only if not passed. This allows more complex queries with
joins etc to be passed to the function.
- * (punkave) Various bugfixes
- </notes>
- </release>
- <release>
- <version>
- <release>0.0.3</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.com/license";>MIT
license</license>
- <date>2009-01-13</date>
- <license>MIT</license>
- <notes>
- * Package compatible with sf1.2 and with last svn version
- * made all failing unit-tests green
- * fixed relation in schema (klemens)
- * beautified schema (klemens)
- * removed schema.xml (klemens)
- * updated schema: don't export constraints to database for
Tagging. This is necessary because multiple models can join
Tagging->taggable_id (klemens)
- * fixed missing "from" part in tags removal (klemens)
- * added option for min tag occurence in selectAllTagWithCount
(mickael)
- * various additional fixes for symfony 1.2 upgrade (new included
doctrine version) (klemens)
- </notes>
- </release>
- <release>
- <version>
- <release>0.0.2</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.com/license";>MIT
license</license>
- <date>2008-09-22</date>
- <license>MIT</license>
- <notes>
- * Organisation of svn, documentation update (Klemens)
- * Added .xml file for plugin-manager (Mickael)
- </notes>
- </release>
- <release>
- <version>
- <release>0.0.1</release>
- <api>1.0.0</api>
- </version>
- <stability>
- <release>stable</release>
- <api>stable</api>
- </stability>
- <license uri="http://www.symfony-project.com/license";>MIT
license</license>
- <date>2008-09-22</date>
- <license>MIT</license>
- <notes>
- * Initial public release. Features tags attachment to heterogene
Doctrine objects, and includes tag-clouds generation. Some bug still remaining
- </notes>
- </release>
- </changelog>
-</package>
Copied: plugins/sfDoctrineActAsTaggablePlugin/trunk/package.xml.tmpl (from rev
27426, plugins/sfDoctrineActAsTaggablePlugin/branches/punkave/package.xml.tmpl)
===================================================================
--- plugins/sfDoctrineActAsTaggablePlugin/trunk/package.xml.tmpl
(rev 0)
+++ plugins/sfDoctrineActAsTaggablePlugin/trunk/package.xml.tmpl
2010-02-02 16:09:53 UTC (rev 27427)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://pear.php.net/dtd/package-2.0";
xmlns:tasks="http://pear.php.net/dtd/tasks-1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; packagerversion="1.4.1"
version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0
http://pear.php.net/dtd/package-2.0.xsd";>
+ <name>sfDoctrineActAsTaggablePlugin</name>
+ <channel>plugins.symfony-project.org</channel>
+ <summary>This behavior allows tags to be attached to Doctrine
objects.</summary>
+ <description>This behavior allows tags to be attached to Doctrine objects.
It includes tag-cloud generation and helpers to display these clouds. It also
offers optional typeahead features for entering tags.
+ </description>
+ <lead>
+ <name>Mickael Kurmann</name>
+ <user>Mickael.Kurmann</user>
+ <email>[email protected]</email>
+ <active>yes</active>
+ </lead>
+ <lead>
+ <name>Klemens Ullmann</name>
+ <user>klemens-ullmann</user>
+ <email>[email protected]</email>
+ <active>yes</active>
+ </lead>
+ <lead>
+ <name>Thomas Boutell</name>
+ <user>boutell</user>
+ <email>[email protected]</email>
+ <active>yes</active>
+ </lead>
+ <developer>
+ <name>Alex Gilbert</name>
+ <user>alex-gilbert</user>
+ <email>[email protected]</email>
+ <active>yes</active>
+ </developer>
+ <developer>
+ <name>Dan Ordille</name>
+ <user>dordille</user>
+ <email>[email protected]</email>
+ <active>yes</active>
+ </developer>
+ <date>##CURRENT_DATE##</date>
+ <version>
+ <release>##PLUGIN_VERSION##</release>
+ <api>##API_VERSION##</api>
+ </version>
+ <stability>
+ <release>##STABILITY##</release>
+ <api>##STABILITY##</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT license</license>
+ <notes>-</notes>
+ <contents>
+ ##CONTENTS##
+ </contents>
+ <dependencies>
+ <required>
+ <php>
+ <min>5.2.4</min>
+ </php>
+ <pearinstaller>
+ <min>1.4.1</min>
+ </pearinstaller>
+ <package>
+ <name>symfony</name>
+ <channel>pear.symfony-project.com</channel>
+ <min>1.2.0</min>
+ <max>1.3.0</max>
+ <exclude>1.3.0</exclude>
+ </package>
+ </required>
+ </dependencies>
+ <phprelease></phprelease>
+ <changelog>
+ <release>
+ <version>
+ <release>0.0.7</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.com/license";>MIT
license</license>
+ <date>2009-06-09</date>
+ <license>MIT</license>
+ <notes>
+ Addressing a packaging problem. No functional changes
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>0.0.5</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.com/license";>MIT
license</license>
+ <date>2009-04-19</date>
+ <license>MIT</license>
+ <notes>
+ * Tag typeahead feature. Optional, based on jQuery (boutell)
+ * getObjectTaggedWithQuery correctly returns nothing rather than
everything when there are no matching objects (agilbert)
+ * Removing tags works properly (boutell, agilbert)
+ * getAllTagName lets you pass a query without setting select() and
from() yourself (but you can if you want to) (boutell, agilbert)
+ * Fixed Doctrine INDEXBY error
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>0.0.4</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.com/license";>MIT
license</license>
+ <date>2009-03-08</date>
+ <license>MIT</license>
+ <notes>
+ * (klemens_u) PluginTagTable::getAllTagNameWithCount: Set the
"from" query part only if not passed. This allows more complex queries with
joins etc to be passed to the function.
+ * (punkave) Various bugfixes
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>0.0.3</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.com/license";>MIT
license</license>
+ <date>2009-01-13</date>
+ <license>MIT</license>
+ <notes>
+ * Package compatible with sf1.2 and with last svn version
+ * made all failing unit-tests green
+ * fixed relation in schema (klemens)
+ * beautified schema (klemens)
+ * removed schema.xml (klemens)
+ * updated schema: don't export constraints to database for
Tagging. This is necessary because multiple models can join
Tagging->taggable_id (klemens)
+ * fixed missing "from" part in tags removal (klemens)
+ * added option for min tag occurence in selectAllTagWithCount
(mickael)
+ * various additional fixes for symfony 1.2 upgrade (new included
doctrine version) (klemens)
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>0.0.2</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.com/license";>MIT
license</license>
+ <date>2008-09-22</date>
+ <license>MIT</license>
+ <notes>
+ * Organisation of svn, documentation update (Klemens)
+ * Added .xml file for plugin-manager (Mickael)
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>0.0.1</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.symfony-project.com/license";>MIT
license</license>
+ <date>2008-09-22</date>
+ <license>MIT</license>
+ <notes>
+ * Initial public release. Features tags attachment to heterogene
Doctrine objects, and includes tag-clouds generation. Some bug still remaining
+ </notes>
+ </release>
+ </changelog>
+</package>
Modified: plugins/sfDoctrineActAsTaggablePlugin/trunk/web/js/pkTagahead.js
===================================================================
--- plugins/sfDoctrineActAsTaggablePlugin/trunk/web/js/pkTagahead.js
2010-02-02 16:06:53 UTC (rev 27426)
+++ plugins/sfDoctrineActAsTaggablePlugin/trunk/web/js/pkTagahead.js
2010-02-02 16:09:53 UTC (rev 27427)
@@ -36,14 +36,14 @@
});
}
// Add suggestions span (you'll need to style that)
- $('input.tag-input').after("<span class='tag-suggestions'></span>");
+ $('input.tag-input').after("<div class='tag-suggestions'></div>");
// Each tag field remembers its suggestions span...
$('input.tag-input').each(function()
{
$(this).data("tag-peer", $(this).next()[0]);
});
// And vice versa
- $('span.tag-suggestions').each(function()
+ $('div.tag-suggestions').each(function()
{
$(this).data("tag-peer", $(this).prev()[0]);
});
@@ -51,7 +51,7 @@
$('input.tag-input').keyup(function(event)
{
var key = getKey(event);
- // Tab key
+ // Tab key
if (key == 9)
{
var peer = $(this).data("tag-peer");
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
