Skip to content
Browse files

changed folder structure. having seperate folders for jamal and the a…

…pplication.

git-svn-id: https://dev.teemow.com/svn/jamal/code/trunk@40 794715e2-6a1e-0410-9566-dec274c41937
  • Loading branch information...
1 parent ebf602e commit d5c4f2e9aa2270a524942ac416546bade6aeb76e @teemow teemow committed Aug 20, 2007
View
18 build/build.xml
@@ -33,13 +33,17 @@
<target name="pack" depends="folders" description="">
<echo message="Packing application..." />
<concat destfile="${DIST_DIR}/jamal.js">
- <fileset dir="${SRC_DIR}" includes="intro.js" />
- <fileset dir="${SRC_DIR}" includes="jamal.js" />
- <fileset dir="${SRC_DIR}" includes="libs/*.js" />
- <fileset dir="${SRC_DIR}" includes="components/*.js" />
- <fileset dir="${SRC_DIR}" includes="startup.js" />
- <fileset dir="${SRC_DIR}" includes="plugins/*.js" />
- <fileset dir="${SRC_DIR}" includes="outro.js" />
+ <fileset dir="${SRC_DIR}" includes="jamal/intro.js" />
+ <fileset dir="${SRC_DIR}" includes="jamal/jamal.js" />
+ <fileset dir="${SRC_DIR}" includes="jamal/libs/*.js" />
+ <fileset dir="${SRC_DIR}" includes="jamal/components/*.js" />
+ <fileset dir="${SRC_DIR}" includes="jamal/startup.js" />
+ <fileset dir="${SRC_DIR}" includes="jamal/plugins/*.js" />
+ <fileset dir="${SRC_DIR}" includes="jamal/outro.js" />
+ <fileset dir="${SRC_DIR}" includes="app/*.js" />
+ <fileset dir="${SRC_DIR}" includes="app/models/*.js" />
+ <fileset dir="${SRC_DIR}" includes="app/views/*.js" />
+ <fileset dir="${SRC_DIR}" includes="app/controllers/*.js" />
</concat>
<java jar="${JS_COMPRESSOR}" fork="true">
<arg value="${BUILD_DIR}/pack.js" />
View
4 src/app_controller.js → src/app/app_controller.js
@@ -14,7 +14,7 @@
* @copyright Copyright (c) 2007, Timo Derstappen
* @link
* @package jamal
- * @subpackage jamal.session
+ * @subpackage jamal.controller
* @since Jamal v 0.4
* @version $Revision$
* @modifiedby $LastChangedBy$
@@ -29,7 +29,7 @@
* @cat controller
*/
jamal.extend(jamal.fn.c.prototype, {
- components: ['session', 'modal', 'remote_debug'],
+ components: ['session', 'modal'],
beforeAction: function() {
},
View
2 src/app_model.js → src/app/app_model.js
@@ -14,7 +14,7 @@
* @copyright Copyright (c) 2007, Timo Derstappen
* @link
* @package jamal
- * @subpackage jamal.session
+ * @subpackage jamal.model
* @since Jamal v 0.4
* @version $Revision$
* @modifiedby $LastChangedBy$
View
19 src/app_view.js → src/app/app_view.js
@@ -14,7 +14,7 @@
* @copyright Copyright (c) 2007, Timo Derstappen
* @link
* @package jamal
- * @subpackage jamal.session
+ * @subpackage jamal.view
* @since Jamal v 0.4
* @version $Revision$
* @modifiedby $LastChangedBy$
@@ -29,21 +29,4 @@
* @cat view
*/
jamal.extend(jamal.fn.v.prototype, {
- /**
- * Add an error message
- *
- * @name addError
- * @param String message The error message that should be displayed
- * @param Mixed obj Element / jQuery object / css selector of an dom element which should contain the error message
- */
- addError: function(message) {
- if (arguments.length>1) {
- obj = arguments[1];
- } else {
- obj = $('tr.edit>td');
- }
- $('div.error', obj).remove();
- $(obj).prepend(message);
- $('div.error', obj).show();
- }
});
View
0 src/components/modal.js → src/jamal/components/modal.js
File renamed without changes.
View
0 src/components/session.js → src/jamal/components/session.js
File renamed without changes.
View
0 src/intro.js → src/jamal/intro.js
File renamed without changes.
View
0 src/jamal.js → src/jamal/jamal.js
File renamed without changes.
View
0 src/libs/controller.js → src/jamal/libs/controller.js
File renamed without changes.
View
0 src/libs/model.js → src/jamal/libs/model.js
File renamed without changes.
View
0 src/libs/view.js → src/jamal/libs/view.js
File renamed without changes.
View
0 src/outro.js → src/jamal/outro.js
File renamed without changes.
View
130 src/plugins/metadata.js → src/jamal/plugins/metadata.js
@@ -1,5 +1,4 @@
-/* SVN FILE: $Id: plugins.js 2378 2007-02-26 14:56:56Z teemow $ */
-/**
+/*
* Metadata - jQuery plugin for parsing metadata from elements
*
* Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer
@@ -8,7 +7,7 @@
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*
- * Revision: $Id: plugins.js 2378 2007-02-26 14:56:56Z teemow $
+ * Revision: $Id: metadata.js 1915 2007-05-18 14:25:48Z joern.zaefferer $
*
*/
@@ -56,67 +55,66 @@
*/
(function($) {
- // settings
- $.meta = {
- type: "class",
- name: "data",
- setType: function(type,name){
- this.type = type;
- this.name = name;
- },
- cre: /({.*})/,
- single: 'data'
- };
-
- // reference to original setArray()
- var setArray = $.fn.setArray;
-
- // define new setArray()
- $.fn.setArray = function(arr){
- return setArray.apply( this, arguments ).each(function(){
- if ( this.metaDone ) return;
-
- var data = "{}";
-
- if ( $.meta.type == "class" ) {
- var m = $.meta.cre.exec( this.className );
- if ( m )
- data = m[1];
- } else if ( $.meta.type == "elem" ) {
- if( !this.getElementsByTagName ) return;
- var e = this.getElementsByTagName($.meta.name);
- if ( e.length )
- data = $.trim(e[0].innerHTML);
- } else if ( this.getAttribute != undefined ) {
- var attr = this.getAttribute( $.meta.name );
- if ( attr )
- data = attr;
- }
-
- if ( !/^{/.test( data ) )
- data = "{" + data + "}";
-
- eval("data = " + data);
-
- if ( $.meta.single )
- this[ $.meta.single ] = data;
- else
- $.extend( this, data );
-
- this.metaDone = true;
- });
- };
-
- /**
- * Returns the metadata object for the first member of the jQuery object.
- *
- * @name data
- * @descr Returns element's metadata object
- * @type jQuery
- * @cat Plugins/Metadata
- */
- $.fn.data = function(){
- return this[0][$.meta.single || "data"];
- };
+ // settings
+ $.meta = {
+ type: "class",
+ name: "metadata",
+ setType: function(type,name){
+ this.type = type;
+ this.name = name;
+ },
+ cre: /({.*})/,
+ single: 'metadata'
+ };
+
+ // reference to original setArray()
+ var setArray = $.fn.setArray;
+
+ // define new setArray()
+ $.fn.setArray = function(arr){
+ return setArray.apply( this, arguments ).each(function(){
+ if ( this.nodeType == 9 || $.isXMLDoc(this) || this.metaDone ) return;
+
+ var data = "{}";
+
+ if ( $.meta.type == "class" ) {
+ var m = $.meta.cre.exec( this.className );
+ if ( m )
+ data = m[1];
+ } else if ( $.meta.type == "elem" ) {
+ if( !this.getElementsByTagName ) return;
+ var e = this.getElementsByTagName($.meta.name);
+ if ( e.length )
+ data = $.trim(e[0].innerHTML);
+ } else if ( this.getAttribute != undefined ) {
+ var attr = this.getAttribute( $.meta.name );
+ if ( attr )
+ data = attr;
+ }
+
+ if ( !/^{/.test( data ) )
+ data = "{" + data + "}";
+
+ data = eval("(" + data + ")");
+
+ if ( $.meta.single )
+ this[ $.meta.single ] = data;
+ else
+ $.extend( this, data );
+
+ this.metaDone = true;
+ });
+ };
+
+ /**
+ * Returns the metadata object for the first member of the jQuery object.
+ *
+ * @name data
+ * @descr Returns element's metadata object
+ * @type jQuery
+ * @cat Plugins/Metadata
+ */
+ $.fn.data = function() {
+ return this[0][$.meta.single];
+ };
})(jQuery);
-
View
0 src/startup.js → src/jamal/startup.js
File renamed without changes.

0 comments on commit d5c4f2e

Please sign in to comment.
Something went wrong with that request. Please try again.