Justin Hileman
fd3dc292a3
Merge branch 'feature/fix-partials' into dev
2010-05-24 10:35:00 -04:00
Justin Hileman
7d4c68f8ad
Merge branch 'dev' into feature/implicit-iterator
...
Conflicts:
Mustache.php
2010-05-23 00:15:16 -04:00
Justin Hileman
11c2b04d8e
fixed typo in comment
2010-05-22 22:44:28 -04:00
Justin Hileman
eb1a896569
Fixed root context swap in clone (was checking context[0], should have checked last element in context stack).
2010-05-22 22:42:54 -04:00
Justin Hileman
0893a7d39d
using array keys instead of iteration over context for creating subcontext arrays. this fixes incorrect context stacks in recursive partials.
2010-05-22 20:40:01 -04:00
Justin Hileman
95abf1d52b
Merge branch 'dev' into feature/fix-partials
...
Conflicts:
Mustache.php
2010-05-22 20:30:52 -04:00
Justin Hileman
0fd759d8f7
Merge branch 'feature/test-coverage' into dev
2010-05-22 20:27:53 -04:00
Justin Hileman
c79501b4ad
Pragmas don't need to be re-rendered for all sub-templates (i.e. sections). Moving call to _renderPragmas into main render() method.
2010-05-22 20:27:31 -04:00
Justin Hileman
7f5f7a73fc
Stop passing context arrays around like a madman.
2010-05-22 19:24:49 -04:00
Justin Hileman
eeb5b245d1
Possible fix for #1 - ability to use partials with an arbitrary (non-Mustache) view class.
2010-05-22 18:34:24 -04:00
Justin Hileman
9f31a821e1
Merge branch 'feature/test-coverage' into dev
2010-05-18 10:28:14 -04:00
Justin Hileman
9e803ed033
Fix for stripping leading/trailing whitespace from partial names,
...
per http://github.com/janl/mustache.js/issues/issue/34/#comment_244396
2010-05-18 10:28:01 -04:00
Justin Hileman
2c3984a604
Fix for #1 - incorrect context for partials.
...
Partials now receive a flattened version of the parent context, including a cloned Mustache instance (if the root context is a Mustache instance). There may be issues with cloning, for example: if a pragma is enabled in the parent template, partials might also inherit the pragma.
Added (basic) test case for partials.
2010-05-16 15:04:22 -04:00
Justin Hileman
ca8e96de97
Minor documentation update
2010-04-30 21:12:13 -04:00
Justin Hileman
c6061baf49
Changed protected _render function to _renderTemplate to avoid ambiguity.
2010-04-30 20:36:18 -04:00
Justin Hileman
7304344c51
Changing all protected functions to start with underscore, freeing up namespace for use in Mustache view classes.
2010-04-30 20:34:31 -04:00
Justin Hileman
5a1143efce
Added _throwsException() check and refactored exception checks.
2010-04-30 20:23:25 -04:00
Justin Hileman
ab95bcd623
Merge branch 'feature/test-coverage' of github.com:bobthecow/mustache.php into feature/test-coverage
...
Conflicts:
Mustache.php
2010-04-30 20:14:47 -04:00
Justin Hileman
1532416306
Prefix Mustache reserved member variables with underscore to prevent namespace collisions with actual view values.
2010-04-30 20:12:37 -04:00
Justin Hileman
c53963f4af
Merge branch 'dev' into feature/test-coverage
...
Conflicts:
test/MustachePragmaTest.php
2010-04-30 11:18:50 -04:00
Justin Hileman
9a30573718
Fixed additional instance of 'only variables should be passed by reference' warning
2010-04-30 11:16:43 -04:00
Justin Hileman
eb94cb8179
Merge branch 'master' into dev
2010-04-30 11:14:49 -04:00
geoffreyd
d5de2d4af7
Fixed warning 'only variables should be passed by reference'
2010-04-30 23:12:39 +08:00
Justin Hileman
37cf2706a9
Allow whitespace in pragma tags.
2010-04-30 00:15:17 -04:00
Justin Hileman
a834ef7845
Added unescaped pragma.
2010-04-30 00:09:27 -04:00
Justin Hileman
20ace3e74c
Implemented implicit iterator pragma.
...
Fixed getPragmaOptions to return empty array if no options are set.
Fixed getVariable to return exact variable name matches before dot notation matches (i.e. the default iterator -- '.' -- will match the iterator and not try to do some crazy dot notation parsing.
2010-04-29 22:49:50 -04:00
Justin Hileman
f68335c845
Return false instead of null in hasPragma. Added documentation for pragma methods.
2010-04-29 21:39:50 -04:00
Justin Hileman
22864870ce
Merge branch 'dev' into feature/test-coverage
...
Conflicts:
Mustache.php
2010-04-29 20:57:34 -04:00
Justin Hileman
2ed23003e7
Made dot-notation pragma toggleable, added test cases.
2010-04-29 20:46:12 -04:00
Justin Hileman
d778838d14
Merge branch 'feature/pragma' into feature/pragma-dot-notation
2010-04-29 19:25:32 -04:00
Justin Hileman
537ebc44c8
Initial work adding pragma detection to Mustache.php
...
Currently stores pragmas and options, but does nothing with them. Also throws exceptions when it encounters unknown pragmas.
Test coverage only for exceptions and pragma tag removal.
2010-04-28 21:51:54 -04:00
Justin Hileman
ce019bec81
Removing renderSection short-circuit, as it doesn't actually improve performance.
2010-04-26 23:27:21 -04:00
Justin Hileman
69a514916c
Updated section short-circuit logic to actually run when only inverted sections exist.
2010-04-26 23:19:20 -04:00
Justin Hileman
9b8454f2ba
Simplified tag RegEx. Fixed bug preventing section modifiers inside comments.
2010-04-26 22:38:33 -04:00
Justin Hileman
ad83344900
Merge branch 'dev' into feature/pragma-dot-notation
...
Conflicts:
README.markdown
2010-04-26 22:03:03 -04:00
Justin Hileman
5a819a33da
Fix for missing child context in sections.
2010-04-26 21:49:54 -04:00
Justin Hileman
668b538669
Prevent iteration over associative arrays.
2010-04-26 21:40:02 -04:00
Justin Hileman
a66e494e6e
Merge branch 'release/0.1'
...
Conflicts:
examples/complex/complex.php
2010-04-26 21:15:59 -04:00
Justin Hileman
f0d171aed6
Merge branch 'dev' into feature/pragma-dot-notation
2010-04-26 20:27:07 -04:00
Justin Hileman
fc170fca11
Add inverted section.
2010-04-26 18:58:58 -04:00
Justin Hileman
db4ff1058d
Merging changes from TraversableMustache
2010-04-23 11:57:24 -04:00
Justin Hileman
05767e3b74
Trailing whitespace cleanup.
2010-04-06 01:11:27 -04:00
Justin Hileman
4baf602eab
Updated default character escaping for UTF-8 compatibility. For other character sets, or to disable UTF-8 support entirely, change the 'charset' property or renderEscaped method on subclasses.
2010-04-06 00:53:32 -04:00
Justin Hileman
a51146f5e2
Fixed RegEx used in changeDelimiter call to match initial RegEx string. This doesn't really need the section tag modifiers (# and /) but they are included here for consistency.
2010-03-29 14:45:15 -04:00
Justin Hileman
b2666da4bb
Wrap the render() function in a __toString method for implicit string conversion.
2010-03-23 10:31:51 -04:00
Justin Hileman
0586105b5e
Updated documentation to reflect thrown exceptions.
2010-03-22 19:20:02 -04:00
Justin Hileman
c849d351f9
Split section exceptions, variable exceptions and partial exceptions into distinct configuration options.
2010-03-22 19:15:46 -04:00
Justin Hileman
d30febdf57
Added MustacheException class, added exceptions for missing variables and partials and unclosed or unopened section tags. Added throwExceptions member variable to enable/disable throwing exceptions on unexpected tags. Defaults to false.
2010-03-22 19:01:45 -04:00
Justin Hileman
e7058fc1d5
Fixed initialization for template and partials to avoid thunking defaults added by subclasses.
2010-03-22 18:01:26 -04:00
Justin Hileman
f3bb419557
Major updates to fix context in iterable blocks. Context is now stored in an array, with the most local context at index 0. Changed everything to pass context arrays around by reference. Added internal function for recursive render calls, allowing the top level to take a single view object, but all internal calls to expect a context array.
2010-03-22 17:44:45 -04:00